Update naming to reflect preferences.