fixed package renaming bugs, tests