Naming conventions that make more sense