rename entity (again)
rename entity class - part 2