Change in class names for puppet 3.x compat.

Change-Id: I6ccb369695259e51b882ed4f330cf989dbc20143
Signed-off-by: Giuseppe Lavagetto <glavagetto@wikimedia.org>