Consolidate naming conventions.