Unify naming convention.