Merge branch 'issue_65_rename_packages' into 'master'

Restore original package name and also for dependencies

Closes #65

See merge request !396
2 jobs from master in 14 minutes and 12 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Build
passed #154686
docker
build_linux

00:14:12

passed #154687
macosx
build_macosx

00:10:44