Fixing back the reference naming scheme to please Glenn