renamed variables, updates for puppet 3
updated usage