Clean up property naming strategy.