shorten the output function names to something more reasonable
6 files changed