* rename direct to imported * km * fix more refs * rename all instances appropriately * rename instances of nonhd