append entity name to all definitions