Adjust default property names

Adjust default property names