Fixed the import paths prior to the rename.