Naming convention is reverted