Add "No Trigger" to names of ZDefinitions

These ZDefinitions now have names distinct from the definitions they
inherit from.