fix up NAT check and clear up naming