Rename from display_ to output_