Follow updated naming conventions.