Rename models Classes and fields to make more sense