Change default gateway name

*Using a more universal gateway name.
*Update headers to use define.