Naming style fixes