changes to include renaming of outputs and exceptions