Small naming tweeks