Rename entity related classes
Abstract some property stuff