Fix property naming