fixing tests and renaming EntityDefinition
renaming classes