Rename Entity classes