minor naming style cleanups