fixed invalid mappings
renamed existing entities