fixed name-spaces, added gendered Greek names.