Fixing a few straggling renamed imports