ARMS-285. puppet: updated naming.