Rename Models

[jon-gourley]

Apparently it's better to not have "Model" suffix on model classes, so all models should be refactored to be in line with this.

Acceptance Criteria:

• Refactor model classes so they do not have "Model" suffix.