Fixing some puppet types that are duplicated

Change-Id: If439220d7e680dbedeb409157f798cd941dbc4a0