Fixed entity name conflicts with core class names