updated model to follow ruby on rails naming conventions