Fix renaming of packages ...
Merge pull request #1715 from samoht/master

Fix renaming of packages ...