Fixed property names in models