Began updating naming conventions and added model factories