Fixing data/variable naming conventions