Rename various variable/function names in controllers