Bug fix in entity name