Fixing property names for minification