Rename import paths to match package names