Reorganized variable names