Merge pull request #426 from puppetlabs/daenney/fix-missing-param-and-naming