-Fixed pkg renaming issues