Some property renaming for increased readability.