renaming, removing externals