Proper property naming (#4300)