Refactored puppet classes to a better naming convention