Complete refactor/rename of NATFan