Renaming the remaining typedef to something a little easier on the eyes.