Minor changes to property naming.