Both come from Latin castellum meaning stronghold or fortified village. I would argue that a château is a type of castle and what you are referring to castle should actually be qualified as a medieval castle specifically.