Fix property names