Fix subnetter format. Update NAT key names.