Clean up some missed refs to former name