Minor refactoring: renamed variables in output_t