Small naming improvements