I read somewhere that Hata had the appearance of Athena planned since the beginning of the manga.
http://www.onemanga.com/Hayate_the_C...utler/1/05-06/
The link above is from the first chapter of the manga. Do you notice Athena's castle at the background?