Rename old classes to new names: model code & tests.
Merge branch 'master' of github.com:neomatrix369/APIUnifier