Rename Entity to Model