Cleanup imports
Correct module name reference.
Fix reference
Apply coding standards - Entity suffix on Doctrine entities.