Simplify naming conventions.