Changed naming conventions to be more consistent. About to start on separating out responsibilities from the controller object.