Rename type variables to be a little clearer