Renaming model classes to match resource names and remove 'Element' which was misleading