fix some import/rename issues after the nrm shuffle