Fix up some remaining refernces to old module