breaking changes

cleaned up usings, changed model names to be consistent with the front
end