Fix deprecated variable names

I had some annoying warnings with puppet 3.0+.
So I changed the variable names accordingly.