Finished package renaming (try again)