Fix puppet issue due to process name change etc.

Change-Id: I8c423a355027413379d6da90ec77147f788a03bb