Fix model property naming for indexes and defaults