Updated so that works with puppet 3.4.3

The problem is that hyphen is no longer allowed in puppet variable names, so had to switch to underscore