Change function names for variables and cateogry to be more ruby-ish