Naming minor changes