Entity refactoring

Change class name