Several refactor for CRUD model
Renamed class name