Merge pull request #314 from micmac1/fs-fix-package-names