Switching to more traditional naming for easier pull reqs

from gh.com