Fixing decorator variable names