Mummy says dashes in puppet names are bad!

Also, tiers vs layers were inconsistent

Change-Id: Ia63aaf3e626ecc98401b098b4115e4190e72467b