fix a whole bunch of aliases