rename output functions for a more tidy structure