CHanges controller function names to be more descriptive