Clean up package_path/root_path naming