Cleanup Output Mode Implementation Names