diff --git a/net/Makefile b/net/Makefile
index 6fd922649c3..f341e0a677e 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -41,12 +41,12 @@ MKDEP		= $(TOPDIR)/tools/mkdeps.sh
 ifeq ($(CONFIG_NET),y)
 STD_ASRCS	=
 STD_CSRCS	= socket.c bind.c connect.c send.c sendto.c recv.c recvfrom.c \
-		  net_sockets.c net-close.c
+		  net-sockets.c net-close.c
 
 ifeq ($(CONFIG_NET_SOCKOPTS),y)
 STD_CSRCS       += setsockopt.c getsockopt.c 
 ifneq ($(CONFIG_DISABLE_CLOCK),y)
-STD_CSRCS	+= net_timeout.c net_dsec2timeval.c net_timeval2dsec.c
+STD_CSRCS	+= net-timeout.c net-dsec2timeval.c net-timeval2dsec.c
 endif
 endif
 
diff --git a/net/bind.c b/net/bind.c
index 118d1d82f42..edc9776d477 100644
--- a/net/bind.c
+++ b/net/bind.c
@@ -44,7 +44,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "net_internal.h"
+#include "net-internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/net/connect.c b/net/connect.c
index 32f962ec098..aaa267227e6 100644
--- a/net/connect.c
+++ b/net/connect.c
@@ -44,7 +44,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "net_internal.h"
+#include "net-internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/net/getsockopt.c b/net/getsockopt.c
index cc183b52f7c..1cd4485ac07 100644
--- a/net/getsockopt.c
+++ b/net/getsockopt.c
@@ -44,7 +44,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "net_internal.h"
+#include "net-internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/net/net-close.c b/net/net-close.c
index 294a4f7b7e7..ca28b510bda 100644
--- a/net/net-close.c
+++ b/net/net-close.c
@@ -44,7 +44,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "net_internal.h"
+#include "net-internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/net/net-dsec2timeval.c b/net/net-dsec2timeval.c
index 7621acd2802..d9b81b43654 100644
--- a/net/net-dsec2timeval.c
+++ b/net/net-dsec2timeval.c
@@ -44,7 +44,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "net_internal.h"
+#include "net-internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/net/net_internal.h b/net/net-internal.h
similarity index 97%
rename from net/net_internal.h
rename to net/net-internal.h
index 7da918bb49b..f4345adb2f8 100644
--- a/net/net_internal.h
+++ b/net/net-internal.h
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net_internal.h
+ * net-internal.h
  *
  *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -45,7 +45,7 @@
 
 #include <nuttx/net.h>
 
-#include "net_internal.h"
+#include "net-internal.h"
 
 /****************************************************************************
  * Definitions
@@ -113,7 +113,7 @@ extern "C" {
 #define EXTERN extern
 #endif
 
-/* net_sockets.c *************************************************************/
+/* net-sockets.c *************************************************************/
 
 EXTERN void weak_function net_initialize(void);
 EXTERN int  sockfd_allocate(void);
diff --git a/net/net_sockets.c b/net/net-sockets.c
similarity index 99%
rename from net/net_sockets.c
rename to net/net-sockets.c
index bed48ffe3ab..0d3b39a2392 100644
--- a/net/net_sockets.c
+++ b/net/net-sockets.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net_sockets.c
+ * net-sockets.c
  *
  *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -45,7 +45,7 @@
 #include <errno.h>
 #include <nuttx/net.h>
 #include <nuttx/kmalloc.h>
-#include "net_internal.h"
+#include "net-internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/net/net-timeo.c b/net/net-timeo.c
index 144dfef453d..930bf946df1 100644
--- a/net/net-timeo.c
+++ b/net/net-timeo.c
@@ -42,7 +42,7 @@
 
 #include <sys/types.h>
 #include <nuttx/os_external.h>
-#include "net_internal.h"
+#include "net-internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/net/net-timeval2dsec.c b/net/net-timeval2dsec.c
index 212bdb85470..401d8bcee4c 100644
--- a/net/net-timeval2dsec.c
+++ b/net/net-timeval2dsec.c
@@ -44,7 +44,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "net_internal.h"
+#include "net-internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/net/recv.c b/net/recv.c
index 70cd4d995b4..e03fbd495c0 100644
--- a/net/recv.c
+++ b/net/recv.c
@@ -44,7 +44,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "net_internal.h"
+#include "net-internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/net/recvfrom.c b/net/recvfrom.c
index 735f767f17d..d6d8b4aca3a 100644
--- a/net/recvfrom.c
+++ b/net/recvfrom.c
@@ -46,7 +46,7 @@
 #include <errno.h>
 #include <arch/irq.h>
 
-#include "net_internal.h"
+#include "net-internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/net/send.c b/net/send.c
index cb93995a7cc..cc2b154a2c2 100644
--- a/net/send.c
+++ b/net/send.c
@@ -44,7 +44,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "net_internal.h"
+#include "net-internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/net/sendto.c b/net/sendto.c
index 86be9968bf6..1917ebf58d8 100644
--- a/net/sendto.c
+++ b/net/sendto.c
@@ -46,7 +46,7 @@
 #include <errno.h>
 #include <arch/irq.h>
 
-#include "net_internal.h"
+#include "net-internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/net/setsockopt.c b/net/setsockopt.c
index 95f535ce18f..b90b9ae3a14 100644
--- a/net/setsockopt.c
+++ b/net/setsockopt.c
@@ -44,7 +44,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "net_internal.h"
+#include "net-internal.h"
 
 /****************************************************************************
  * Global Functions
diff --git a/net/socket.c b/net/socket.c
index 43d4645fd28..b35c8e8662a 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -44,7 +44,7 @@
 #include <sys/socket.h>
 #include <errno.h>
 
-#include "net_internal.h"
+#include "net-internal.h"
 
 /****************************************************************************
  * Global Functions