Fixes variable names in Controller