Update naming to reflect new standards.