Cleaned up some naming conventions, and altered the back end database field names to be more clear.