Changing puppet module to puppet-module according to docs and more improvements.