But for the sake of logic, you should also put the un-upgraded unit on a dragon.
Or on a pegasus instead of a horse:D
Added after 26 minutes
By the way, I just logged into the game to check. There is no text in the name of the building for the creatures.
And also, the dragon's head doesn't fit on the screen when you're viewing the unit in the castle.