Renamed NpAddress to NpEndPoint