Finished package renaming (with comments)