Refactored Entity class names to remove *entity