fixed naming and entities