diff --git a/network/config/bindview/BINDVIEW.CPP b/network/config/bindview/BINDVIEW.CPP
index 8fee84be5..dbd26fb57 100644
--- a/network/config/bindview/BINDVIEW.CPP
+++ b/network/config/bindview/BINDVIEW.CPP
@@ -1563,7 +1563,7 @@ VOID ShowBindingPathMenu (HWND hwndOwner,
 //    lpdwItemType [out] Type, binding path or network component.
 //    fEnabled     [out] TRUE if the binding path or component is enabled.
 //
-// Returns:   TRUE on sucess.
+// Returns:   TRUE on success.
 //
 // Notes:
 //
diff --git a/network/modem/fakemodem/driver.c b/network/modem/fakemodem/driver.c
index 8484d95f2..1027fda75 100644
--- a/network/modem/fakemodem/driver.c
+++ b/network/modem/fakemodem/driver.c
@@ -15,8 +15,8 @@ Module Name:
 
     This is a simple form of function driver for fakemodem device. The driver
     doesn't handle any PnP and Power events because the framework provides
-    default behaviour for those events. This driver has enough support to
-    allow an user application (toast/notify.exe) to open the device
+    default behavior for those events. This driver has enough support to
+    allow a user application (toast/notify.exe) to open the device
     interface registered by the driver and send read, write or ioctl requests.
 
 Environment:
diff --git a/network/modem/fakemodem/ioctl.c b/network/modem/fakemodem/ioctl.c
index 445910bd7..a3268cd2c 100644
--- a/network/modem/fakemodem/ioctl.c
+++ b/network/modem/fakemodem/ioctl.c
@@ -689,7 +689,7 @@ Return Value:
         case IOCTL_SERIAL_SET_HANDFLOW:
         case IOCTL_SERIAL_RESET_DEVICE: {
             //
-            // NOTE: The application expects STATUS_SUCCESS for these ioctsl.
+            // NOTE: The application expects STATUS_SUCCESS for these ioctls.
             //  so don't merge this with default.
             //
             break;
diff --git a/network/modem/fakemodem/readwrit.c b/network/modem/fakemodem/readwrit.c
index af6da9373..fbce3e9ab 100644
--- a/network/modem/fakemodem/readwrit.c
+++ b/network/modem/fakemodem/readwrit.c
@@ -9,14 +9,14 @@ Copyright (c) Microsoft Corporation.  All rights reserved.
 
 Module Name:
 
-    ioctl.c
+    readwrit.c
 
 Abstract:
 
     This is a simple form of function driver for Fm device. The driver
     doesn't handle any PnP and Power events because the framework provides
-    default behaviour for those events. This driver has enough support to
-    allow an user application (toast/notify.exe) to open the device
+    default behavior for those events. This driver has enough support to
+    allow a user application (toast/notify.exe) to open the device
     interface registered by the driver and send read, write or ioctl requests.
 
 Environment:
@@ -49,8 +49,8 @@ Routine Description:
 
     Length - Length of the IO operation
                  The default property of the queue is to not dispatch
-                 zero lenght read & write requests to the driver and
-                 complete is with status success. So we will never get
+                 zero length read & write requests to the driver and
+                 complete it with status success. So we will never get
                  a zero length request.
 
 Return Value:
@@ -117,8 +117,8 @@ Routine Description:
 
     Length - Length of the IO operation
                  The default property of the queue is to not dispatch
-                 zero lenght read & write requests to the driver and
-                 complete is with status success. So we will never get
+                 zero length read & write requests to the driver and
+                 complete it with status success. So we will never get
                  a zero length request.
 
 Return Value:
@@ -193,8 +193,8 @@ Routine Description:
 
     Length - Length of the IO operation
                  The default property of the queue is to not dispatch
-                 zero lenght read & write requests to the driver and
-                 complete is with status success. So we will never get
+                 zero length read & write requests to the driver and
+                 complete it with status success. So we will never get
                  a zero length request.
 
 Return Value:
diff --git a/network/ndis/extension/base/SxApi.h b/network/ndis/extension/base/SxApi.h
index d52d5a037..a8c4c0dbb 100644
--- a/network/ndis/extension/base/SxApi.h
+++ b/network/ndis/extension/base/SxApi.h
@@ -58,7 +58,7 @@ SxExtInitialize
 
 Routine Description:
     This function is called from the SxBase Library during DriverEntry.
-    An extension should allocate/initalize all global data in this function.
+    An extension should allocate/initialize all global data in this function.
 
 Arguments:
     NULL
@@ -410,7 +410,7 @@ SxExtDeleteNic
 
 Routine Description:
     This function is called to delete a NIC from a switch.
-    No futher traffic/control will be recieved for this NIC.
+    No further traffic/control will be received for this NIC.
 
 Arguments:
     Switch - the Switch context
@@ -438,7 +438,7 @@ SxExtTeardownPort
 
 Routine Description:
     This function is called to start deletion of a port on a switch.
-    Upon recieving this call, no further references may be taken
+    Upon receiving this call, no further references may be taken
     on the given port.
 
 Arguments:
@@ -467,7 +467,7 @@ SxExtDeletePort
 
 Routine Description:
     This function is called to finish deletion of a port on a switch.
-    Upon recieving this call, no traffic/control will be recieved
+    Upon receiving this call, no traffic/control will be received
     for this port.
 
 Arguments:
@@ -825,7 +825,7 @@ Routine Description:
     ExtensionContext - The extension context allocated in SxExtCreateSwitch
                        for the switch
 
-    SwitchProperty - the property to be deleted
+    PortProperty - the property to be deleted
 
 Return Value:
     TRUE - if the policy is not consumed by this extension
@@ -918,7 +918,7 @@ SxExtQueryPortFeatureStatus(
 SxExtProcessNicRequest
 
 Routine Description:
-    This function is called upon the reciept of an OID_SWITCH_NIC_REQUEST
+    This function is called upon the receipt of an OID_SWITCH_NIC_REQUEST
     to the extension.
     If an extension wishes to redirect the OID, it must return a valid
     DestinationPortId and DestinationNicIndex, which it has taken a
@@ -982,7 +982,15 @@ Routine Description:
     ExtensionContext - The extension context allocated in SxExtCreateSwitch
                        for the switch
 
-    NicOidRequest - the OID buffer, encapsulated with source/destination info
+    OidRequest - the OID buffer, encapsulated with source/destination info
+
+    SourcePortId - the source PortId of the OID completion
+
+    SourceNicIndex - the source NicIndex of the OID completion
+
+    DestinationPortId - the destination PortId of the OID completion
+
+    DestinationNicIndex - the destination NicIndex of the OID completion
 
     Status - the status the OID completed with
 
@@ -1008,12 +1016,12 @@ SxExtProcessNicRequestComplete(
 SxExtProcessNicStatus
 
 Routine Description:
-    This function is called upon the reciept of an NDIS_STATUS_SWITCH_NIC_STATUS
+    This function is called upon the receipt of an NDIS_STATUS_SWITCH_NIC_STATUS
     to the extension.
     If the extension wishes to modify the status indication, it should
     send its own status indication using NdisFIndicateStatus and return a
     failure status.
-    If the extension wishes to drop the status indiction, it should return
+    If the extension wishes to drop the status indication, it should return
     failure status, though this should be done very sparingly and carefully.
 
     !! This function should only be used by forwarding extensions. !!
diff --git a/network/ndis/extension/base/SxBase.c b/network/ndis/extension/base/SxBase.c
index 0d9bc91ab..ad84138a3 100644
--- a/network/ndis/extension/base/SxBase.c
+++ b/network/ndis/extension/base/SxBase.c
@@ -348,7 +348,7 @@ SxNdisDetach(
     ExFreePool(switchObject);
 
     //
-    // Alway return success.
+    // Always return success.
     //
     DEBUGP(DL_TRACE, ("<===SxDetach Successfully\n"));
 
diff --git a/network/ndis/extension/base/SxBase.h b/network/ndis/extension/base/SxBase.h
index 8418ff940..b5471f288 100644
--- a/network/ndis/extension/base/SxBase.h
+++ b/network/ndis/extension/base/SxBase.h
@@ -4,7 +4,7 @@ Copyright (c) Microsoft Corporation. All Rights Reserved.
 
 Module Name:
 
-    SxBase.c
+    SxBase.h
 
 Abstract:
 
diff --git a/network/ndis/extension/base/SxLibrary.h b/network/ndis/extension/base/SxLibrary.h
index 325b93615..7071ab0c3 100644
--- a/network/ndis/extension/base/SxLibrary.h
+++ b/network/ndis/extension/base/SxLibrary.h
@@ -23,7 +23,7 @@ Routine Description:
     This function is called to forward NBLs on ingress.
     The extension MUST call this function, or call
     SxLibCompleteNetBufferListsIngress for every NBL in NetBufferLists,
-    recieved in SxExtStartNetBufferListsIngress.
+    received in SxExtStartNetBufferListsIngress.
 
     This function can also be called to inject NBLs.
     If there are NBLs in NetBufferLists that are initiated by the
@@ -62,7 +62,7 @@ Routine Description:
     This function is called to forward NBLs on egress.
     The extension MUST call this function, or call
     SxLibCompleteNetBufferListsEgress for every NBL in NetBufferLists
-    recieved in SxExtStartNetBufferListsEgress.
+    received in SxExtStartNetBufferListsEgress.
 
 Arguments:
 
@@ -94,7 +94,7 @@ SxLibCompleteNetBufferListsEgress
 
 Routine Description:
     This function is called to complete NBLs on egress.
-    The extension MUST call this function for all NBLs recieved
+    The extension MUST call this function for all NBLs received
     in SxExtStartCompleteNetBufferListsEgress.
 
 Arguments:
@@ -124,7 +124,7 @@ SxLibCompleteNetBufferListsIngress
 Routine Description:
     This function is called to complete NBLs on ingress.
     The extension MUST call this function, or
-    SxLibCompletedInjectedNetBufferLists for all NBLs recieved in
+    SxLibCompletedInjectedNetBufferLists for all NBLs received in
     SxExtStartCompleteNetBufferListsEgress.
 
 Arguments:
@@ -190,7 +190,7 @@ Routine Description:
 
 Arguments:
 
-    Switch - pointer to our switch object.
+    SxSwitch - pointer to our switch object.
 
     RequestType - NdisRequest[Set|Query|method]Information.
 
@@ -261,7 +261,7 @@ Routine Description:
     This function is called to get the current array
     of ports.
 
-    NOTE: It is necessary to synchonize this with SxExtPortCreate
+    NOTE: It is necessary to synchronize this with SxExtPortCreate
     and SxExtPortTeardown.
 
 Arguments:
@@ -292,12 +292,12 @@ Routine Description:
     This function is called to get the current array
     of NICs.
 
-    NOTE: It is necessary to synchonize this with SxExtNicConnect
+    NOTE: It is necessary to synchronize this with SxExtNicConnect
     and SxExtNicDisconnect.
 
 Arguments:
 
-    Switch - the Switch context
+    SxSwitch - the Switch context
 
     NicArray - the returned NIC array
 
@@ -322,7 +322,7 @@ Routine Description:
     This function is called to get the current array of the switch
     property queried.
 
-    NOTE: It is necessary to synchonize this with SxExtAddSwitchProperty
+    NOTE: It is necessary to synchronize this with SxExtAddSwitchProperty
     and SxExtDeleteSwitchProperty.
 
 Arguments:
@@ -333,8 +333,6 @@ Routine Description:
 
     PropertyId - the GUID of the property (from mof file)
 
-    PropertyVersion - the version of the property
-
     SwitchPropertyEnumParameters - the returned property enum
 
 Return Value:
@@ -360,7 +358,7 @@ Routine Description:
     This function is called to get the current array of the switch
     property queried.
 
-    NOTE: It is necessary to synchonize this with SxExtAddPortProperty
+    NOTE: It is necessary to synchronize this with SxExtAddPortProperty
     and SxExtDeletePortProperty.
 
 Arguments:
diff --git a/network/ndis/filter/filteruser.h b/network/ndis/filter/filteruser.h
index ac03e04b6..ba09a860b 100644
--- a/network/ndis/filter/filteruser.h
+++ b/network/ndis/filter/filteruser.h
@@ -1,5 +1,5 @@
 //
-//    Copyright (C) Microsoft.  All rights reserved.
+//    Copyright (C) Microsoft Corporation.  All rights reserved.
 //
 #ifndef __FILTERUSER_H__
 #define __FILTERUSER_H__
diff --git a/network/ndis/filter/flt_dbg.c b/network/ndis/filter/flt_dbg.c
index 1d52071d9..a65c43124 100644
--- a/network/ndis/filter/flt_dbg.c
+++ b/network/ndis/filter/flt_dbg.c
@@ -4,7 +4,7 @@ Copyright (c) 2001  Microsoft Corporation
 
 Module Name:
 
-    debug.c
+    flt_dbg.c
 
 Abstract:
 
diff --git a/network/ndis/filter/flt_dbg.h b/network/ndis/filter/flt_dbg.h
index f35135881..a7cb0da39 100644
--- a/network/ndis/filter/flt_dbg.h
+++ b/network/ndis/filter/flt_dbg.h
@@ -4,7 +4,7 @@ Copyright (c) 2001  Microsoft Corporation
 
 Module Name:
 
-    debug.h
+    flt_dbg.h
 
 Abstract:
 
@@ -17,9 +17,6 @@ Revision History:
 
 --*/
 
-// disable warnings
-
-
 #ifndef _FILTDEBUG__H
 #define _FILTDEBUG__H
 
diff --git a/network/ndis/mux/driver/60/protocol.c b/network/ndis/mux/driver/60/protocol.c
index b2b1e209d..8a697c04e 100644
--- a/network/ndis/mux/driver/60/protocol.c
+++ b/network/ndis/mux/driver/60/protocol.c
@@ -1,5 +1,5 @@
 /*++
-Copyright(c) 1992-2000  Microsoft Corporation
+Copyright (c) 1992-2000  Microsoft Corporation
 
 Module Name:
 
diff --git a/network/ndis/ndisprot/6x/sys/60/ndisprot60.rc b/network/ndis/ndisprot/6x/sys/60/ndisprot60.rc
index 96ee82a46..5e9c282ce 100644
--- a/network/ndis/ndisprot/6x/sys/60/ndisprot60.rc
+++ b/network/ndis/ndisprot/6x/sys/60/ndisprot60.rc
@@ -9,7 +9,7 @@ Copyright (c) Microsoft Corporation.  All rights reserved.
 
 Module Name:
 
-    ndisprot.rc
+    ndisprot60.rc
 
 Abstract:
 
diff --git a/network/ndis/ndisprot/6x/sys/630/ndisprot630.rc b/network/ndis/ndisprot/6x/sys/630/ndisprot630.rc
index b2594f2e4..91bff7f3a 100644
--- a/network/ndis/ndisprot/6x/sys/630/ndisprot630.rc
+++ b/network/ndis/ndisprot/6x/sys/630/ndisprot630.rc
@@ -9,7 +9,7 @@ Copyright (c) Microsoft Corporation.  All rights reserved.
 
 Module Name:
 
-    ndisprot.rc
+    ndisprot630.rc
 
 Abstract:
 
diff --git a/network/ndis/ndisprot/6x/sys/protuser.h b/network/ndis/ndisprot/6x/sys/protuser.h
index 3235626c7..31432ed1e 100644
--- a/network/ndis/ndisprot/6x/sys/protuser.h
+++ b/network/ndis/ndisprot/6x/sys/protuser.h
@@ -4,7 +4,7 @@ Copyright (c) 2000  Microsoft Corporation
 
 Module Name:
 
-    nuiouser.h
+    protuser.h
 
 Abstract:
 
diff --git a/network/ndis/ndisprot_kmdf/60/protuser.h b/network/ndis/ndisprot_kmdf/60/protuser.h
index 44a57c953..cba3a6782 100644
--- a/network/ndis/ndisprot_kmdf/60/protuser.h
+++ b/network/ndis/ndisprot_kmdf/60/protuser.h
@@ -4,7 +4,7 @@ Copyright (c) 2000  Microsoft Corporation
 
 Module Name:
 
-    nuiouser.h
+    protuser.h
 
 Abstract:
 
diff --git a/network/ndis/ndisprot_kmdf/60/send.c b/network/ndis/ndisprot_kmdf/60/send.c
index 5c0099398..31efd03c7 100644
--- a/network/ndis/ndisprot_kmdf/60/send.c
+++ b/network/ndis/ndisprot_kmdf/60/send.c
@@ -37,10 +37,10 @@ Routine Description:
 
     Queue - Default queue handle
     Request - Handle to the read/write request
-    Lenght - Length of the data buffer associated with the request.
+    Length - Length of the data buffer associated with the request.
                  The default property of the queue is to not dispatch
-                 zero lenght read & write requests to the driver and
-                 complete is with status success. So we will never get
+                 zero length read & write requests to the driver and
+                 complete it with status success. So we will never get
                  a zero length request.
 
 Return Value:
diff --git a/network/ndis/netvmini/6x/60/netvmini60.rc b/network/ndis/netvmini/6x/60/netvmini60.rc
index ac4705340..a01b20977 100644
--- a/network/ndis/netvmini/6x/60/netvmini60.rc
+++ b/network/ndis/netvmini/6x/60/netvmini60.rc
@@ -9,7 +9,7 @@ Copyright (c) Microsoft Corporation.  All rights reserved.
 
 Module Name:
 
-    netvmini.rc
+    netvmini60.rc
 
 Abstract:
 
diff --git a/network/ndis/netvmini/6x/620/netvmini620.rc b/network/ndis/netvmini/6x/620/netvmini620.rc
index 72dba1378..ddd4495d5 100644
--- a/network/ndis/netvmini/6x/620/netvmini620.rc
+++ b/network/ndis/netvmini/6x/620/netvmini620.rc
@@ -9,7 +9,7 @@ Copyright (c) Microsoft Corporation.  All rights reserved.
 
 Module Name:
 
-    netvmini.rc
+    netvmini620.rc
 
 Abstract:
 
diff --git a/network/ndis/netvmini/6x/adapter.c b/network/ndis/netvmini/6x/adapter.c
index 3cf0ce597..1dd3e3124 100644
--- a/network/ndis/netvmini/6x/adapter.c
+++ b/network/ndis/netvmini/6x/adapter.c
@@ -552,7 +552,7 @@ Routine Description:
     send requests must be completed, and new requests must be rejected with
     NDIS_STATUS_PAUSED.
 
-    Once all sends have been completed and all recieve NBLs have returned to
+    Once all sends have been completed and all receive NBLs have returned to
     the miniport, the miniport enters the Paused state.
 
     While paused, the miniport can still service interrupts from the hardware
@@ -2281,7 +2281,7 @@ Routine Description:
 
 Return Value:
 
-    NDIS_STATUS_SUCCESS if reference was acquired succesfully.
+    NDIS_STATUS_SUCCESS if reference was acquired successfully.
     NDIS_STATUS_ADAPTER_NOT_READY if the adapter state is such that we should not acquire new references to resources
 
 --*/
diff --git a/network/ndis/netvmini/6x/adapter.h b/network/ndis/netvmini/6x/adapter.h
index cfc540d3c..92d84508f 100644
--- a/network/ndis/netvmini/6x/adapter.h
+++ b/network/ndis/netvmini/6x/adapter.h
@@ -52,14 +52,14 @@ typedef struct _MP_ADAPTER_RECEIVE_DPC
 {
     LIST_ENTRY Entry;
     //
-    // Kernel DPC used for recieve
+    // Kernel DPC used for receive
     //
     KDPC Dpc;
     USHORT ProcessorGroup;
     ULONG ProcessorNumber;
 
     //
-    // Tracks which receive blocks need to be recieved on this DPC.
+    // Tracks which receive blocks need to be received on this DPC.
     //
     BOOLEAN RecvBlock[NIC_SUPPORTED_NUM_QUEUES];
     volatile LONG RecvBlockCount;
diff --git a/network/ndis/netvmini/6x/datapath.c b/network/ndis/netvmini/6x/datapath.c
index 1c18094cb..19b7cb6c8 100644
--- a/network/ndis/netvmini/6x/datapath.c
+++ b/network/ndis/netvmini/6x/datapath.c
@@ -755,7 +755,7 @@ Routine Description:
 
 Return Value:
 
-    NDIS_STATUS_SUCCESS if reference was acquired succesfully.
+    NDIS_STATUS_SUCCESS if reference was acquired successfully.
     NDIS_STATUS_ADAPTER_NOT_READY if the adapter state is such that we should not acquire new references to resources
 
 --*/
diff --git a/network/ndis/netvmini/6x/miniport.h b/network/ndis/netvmini/6x/miniport.h
index 364ad7043..77d685992 100644
--- a/network/ndis/netvmini/6x/miniport.h
+++ b/network/ndis/netvmini/6x/miniport.h
@@ -19,7 +19,7 @@ Module Name:
        1.  Set the correct driver version number for your versioning scheme.
        2.  Create unique memory allocation tags.
 
- --*/
+--*/
 
 
 #ifndef _MINIPORT_H
diff --git a/network/ndis/netvmini/6x/trace.h b/network/ndis/netvmini/6x/trace.h
index b42c52753..b8adbd2e1 100644
--- a/network/ndis/netvmini/6x/trace.h
+++ b/network/ndis/netvmini/6x/trace.h
@@ -14,7 +14,7 @@ Module Name:
 Abstract:
 
 
- --*/
+--*/
 
 
 #ifndef _TRACE_H
diff --git a/network/ndis/netvmini/6x/vmq.c b/network/ndis/netvmini/6x/vmq.c
index 942ee009a..71c561bb7 100644
--- a/network/ndis/netvmini/6x/vmq.c
+++ b/network/ndis/netvmini/6x/vmq.c
@@ -3104,7 +3104,7 @@ Routine Description:
 Arguments:
 
     Adapter                - Pointer to our adapter
-    Rcb                    - RCB to queue for recieve
+    Rcb                    - RCB to queue for receive
 
 Return Value: