A subtle point of semantics, but the 'keep' is the strongest point of last defense in a castle, so the tall tower may be the 'keep' and the big square building is the maor house.
The tower way out back might even be more of a 'keep' depending on the details.

Labeling nit pick aside, it looks like a good project off to a good start.