Name changes for ZDS archiver

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1453 42af7a65-404d-4744-a932-0658087f49c3

31 files changed, 95 insertions, 100 deletions

diff --git a/nuttx/net/uip/Make.defs b/nuttx/net/uip/Make.defs
index 543a8e856..234e6a9bc 100644
--- a/nuttx/net/uip/Make.defs
+++ b/nuttx/net/uip/Make.defs
@@ -34,26 +34,26 @@
 ############################################################################
 
 UIP_ASRCS =
-UIP_CSRCS = 
+UIP_CSRCS =
 
 ifeq ($(CONFIG_NET),y)
 
 # Common IP source files
 
-UIP_CSRCS += uip-initialize.c uip-setipid.c uip-arp.c uip-input.c uip-send.c \
-             uip-poll.c uip-chksum.c uip-callback.c
+UIP_CSRCS += uip_initialize.c uip_setipid.c uip_arp.c uip_input.c uip_send.c \
+             uip_poll.c uip_chksum.c uip_callback.c
 
 ifeq ($(CONFIG_NET_IPv6),y)
-UIP_CSRCS += uip-neighbor.c
+UIP_CSRCS += uip_neighbor.c
 endif
 
 # TCP source files
 
 ifeq ($(CONFIG_NET_TCP),y)
 
-UIP_CSRCS += uip-tcpconn.c uip-tcppoll.c uip-tcptimer.c uip-tcpsend.c \
-             uip-tcpinput.c uip-tcpappsend.c uip-listen.c uip-tcpcallback.c \
-             uip-tcpreadahead.c uip-tcpbacklog.c
+UIP_CSRCS += uip_tcpconn.c uip_tcppoll.c uip_tcptimer.c uip_tcpsend.c \
+             uip_tcpinput.c uip_tcpappsend.c uip_listen.c uip_tcpcallback.c \
+             uip_tcpreadahead.c uip_tcpbacklog.c
 
 endif
 
@@ -61,8 +61,8 @@ endif
 
 ifeq ($(CONFIG_NET_UDP),y)
 
-UIP_CSRCS += uip-udpconn.c uip-udppoll.c uip-udpsend.c uip-udpinput.c \
-             uip-udpcallback.c
+UIP_CSRCS += uip_udpconn.c uip_udppoll.c uip_udpsend.c uip_udpinput.c \
+             uip_udpcallback.c
 
 endif
 
@@ -70,11 +70,11 @@ endif
 
 ifeq ($(CONFIG_NET_ICMP),y)
 
-UIP_CSRCS += uip-icmpinput.c
+UIP_CSRCS += uip_icmpinput.c
 
 ifeq ($(CONFIG_NET_ICMP_PING),y)
 ifneq ($(CONFIG_DISABLE_CLOCK),y)
-UIP_CSRCS += uip-icmpping.c uip-icmppoll.c uip-icmpsend.c
+UIP_CSRCS += uip_icmpping.c uip_icmppoll.c uip_icmpsend.c
 endif
 endif
 
diff --git a/nuttx/net/uip/uip-arp.c b/nuttx/net/uip/uip_arp.c
index 00826ec46..7d10db66c 100644
--- a/nuttx/net/uip/uip-arp.c
+++ b/nuttx/net/uip/uip_arp.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip-arp.c
+ * net/uip/uip_arp.c
  * Implementation of the ARP Address Resolution Protocol.
  *
  *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
diff --git a/nuttx/net/uip/uip-callback.c b/nuttx/net/uip/uip_callback.c
index 27f3a522e..60ead736f 100644
--- a/nuttx/net/uip/uip-callback.c
+++ b/nuttx/net/uip/uip_callback.c
@@ -1,10 +1,9 @@
 /****************************************************************************
- * net/uip/uip-callback.c
+ * net/uip/uip_callback.c
  *
  *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -49,7 +48,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Private Data
diff --git a/nuttx/net/uip/uip-chksum.c b/nuttx/net/uip/uip_chksum.c
index 0bfa82861..474dae576 100644
--- a/nuttx/net/uip/uip-chksum.c
+++ b/nuttx/net/uip/uip_chksum.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip-chksum.c
+ * net/uip/uip_chksum.c
  *
  *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -48,7 +48,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/uip/uip-icmpinput.c b/nuttx/net/uip/uip_icmpinput.c
index 32bfe2db9..f515bc7fb 100644
--- a/nuttx/net/uip/uip-icmpinput.c
+++ b/nuttx/net/uip/uip_icmpinput.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip-icmpinput.c
+ * net/uip/uip_icmpinput.c
  * Handling incoming ICMP/ICMP6 input
  *
  *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
@@ -53,7 +53,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 #ifdef CONFIG_NET_ICMP
 
diff --git a/nuttx/net/uip/uip-icmpping.c b/nuttx/net/uip/uip_icmpping.c
index fa6f44f60..44c056be4 100644
--- a/nuttx/net/uip/uip-icmpping.c
+++ b/nuttx/net/uip/uip_icmpping.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip-icmpping.c
+ * net/uip/uip_icmpping.c
  *
  *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -51,8 +51,8 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
-#include "../net-internal.h" /* Should not include this! */
+#include "uip_internal.h"
+#include "../net_internal.h" /* Should not include this! */
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/uip/uip-icmppoll.c b/nuttx/net/uip/uip_icmppoll.c
index 662409eb1..6a61c73ed 100644
--- a/nuttx/net/uip/uip-icmppoll.c
+++ b/nuttx/net/uip/uip_icmppoll.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip-icmppoll.c
+ * net/uip/uip_icmppoll.c
  *
  *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -47,7 +47,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/uip/uip-icmpsend.c b/nuttx/net/uip/uip_icmpsend.c
index fc8ac2e83..8e68441f2 100644
--- a/nuttx/net/uip/uip-icmpsend.c
+++ b/nuttx/net/uip/uip_icmpsend.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip-icmsend.c
+ * net/uip/uip_icmsend.c
  *
  *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -47,7 +47,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/uip/uip-initialize.c b/nuttx/net/uip/uip_initialize.c
index c2ea121ec..3b73e253b 100644
--- a/nuttx/net/uip/uip-initialize.c
+++ b/nuttx/net/uip/uip_initialize.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip-initialize.c
+ * net/uip/uip_initialize.c
  *
  *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -46,7 +46,7 @@
 
 #include <net/uip/uip.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/uip/uip-input.c b/nuttx/net/uip/uip_input.c
index 52f29f20c..640103b87 100644
--- a/nuttx/net/uip/uip-input.c
+++ b/nuttx/net/uip/uip_input.c
@@ -1,8 +1,8 @@
 /****************************************************************************
- * net/uip/uip-input.c
+ * net/uip/uip_input.c
  * The uIP TCP/IP stack code.
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Adapted for NuttX from logic in uIP which also has a BSD-like license:
@@ -91,10 +91,10 @@
 #include <net/uip/uip-arch.h>
 
 #ifdef CONFIG_NET_IPv6
-# include "uip-neighbor.h"
+# include "uip_neighbor.h"
 #endif /* CONFIG_NET_IPv6 */
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/uip/uip-internal.h b/nuttx/net/uip/uip_internal.h
index 841555760..77b358401 100644
--- a/nuttx/net/uip/uip-internal.h
+++ b/nuttx/net/uip/uip_internal.h
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/uip/uip-internal.h
+ * net/uip/uip_internal.h
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * This logic was leveraged from uIP which also has a BSD-style license:
@@ -111,11 +111,11 @@ EXTERN struct uip_conn *uip_tcplistener(uint16 portno);
 EXTERN struct uip_conn *uip_tcpaccept(struct uip_tcpip_hdr *buf);
 EXTERN void uip_tcpnextsequence(void);
 
-/* Defined in uip-tcppoll.c *************************************************/
+/* Defined in uip_tcppoll.c *************************************************/
 
 EXTERN void uip_tcppoll(struct uip_driver_s *dev, struct uip_conn *conn);
 
-/* Defined in uip-udptimer.c ************************************************/
+/* Defined in uip_udptimer.c ************************************************/
 
 EXTERN void uip_tcptimer(struct uip_driver_s *dev, struct uip_conn *conn, int hsec);
 
@@ -125,7 +125,7 @@ EXTERN void uip_listeninit(void);
 EXTERN boolean uip_islistener(uint16 port);
 EXTERN int uip_accept(struct uip_driver_s *dev, struct uip_conn *conn, uint16 portno);
 
-/* Defined in uip-tcpsend.c *************************************************/
+/* Defined in uip_tcpsend.c *************************************************/
 
 EXTERN void uip_tcpsend(struct uip_driver_s *dev, struct uip_conn *conn,
                         uint16 flags, uint16 len);
@@ -133,14 +133,14 @@ EXTERN void uip_tcpreset(struct uip_driver_s *dev);
 EXTERN void uip_tcpack(struct uip_driver_s *dev, struct uip_conn *conn,
                        uint8 ack);
 
-/* Defined in uip-tcpappsend.c **********************************************/
+/* Defined in uip_tcpappsend.c **********************************************/
 
 EXTERN void uip_tcpappsend(struct uip_driver_s *dev, struct uip_conn *conn,
                            uint16 result);
 EXTERN void uip_tcprexmit(struct uip_driver_s *dev, struct uip_conn *conn,
                           uint16 result);
 
-/* Defined in uip-tcpinput.c ************************************************/
+/* Defined in uip_tcpinput.c ************************************************/
 
 EXTERN void uip_tcpinput(struct uip_driver_s *dev);
 
@@ -149,7 +149,7 @@ EXTERN void uip_tcpinput(struct uip_driver_s *dev);
 EXTERN uint16 uip_tcpcallback(struct uip_driver_s *dev,
                               struct uip_conn *conn, uint16 flags);
 
-/* Defined in uip-tcpreadahead.c ********************************************/
+/* Defined in uip_tcpreadahead.c ********************************************/
 
 #if CONFIG_NET_NTCP_READAHEAD_BUFFERS > 0
 EXTERN void uip_tcpreadaheadinit(void);
@@ -166,15 +166,15 @@ EXTERN void uip_udpinit(void);
 EXTERN struct uip_udp_conn *uip_udpactive(struct uip_udpip_hdr *buf);
 EXTERN struct uip_udp_conn *uip_nextudpconn(struct uip_udp_conn *conn);
 
-/* Defined in uip-udppoll.c *************************************************/
+/* Defined in uip_udppoll.c *************************************************/
 
 EXTERN void uip_udppoll(struct uip_driver_s *dev, struct uip_udp_conn *conn);
 
-/* Defined in uip-udpsend.c *************************************************/
+/* Defined in uip_udpsend.c *************************************************/
 
 EXTERN void uip_udpsend(struct uip_driver_s *dev, struct uip_udp_conn *conn);
 
-/* Defined in uip-udpinput.c ************************************************/
+/* Defined in uip_udpinput.c ************************************************/
 
 EXTERN void uip_udpinput(struct uip_driver_s *dev);
 
@@ -185,16 +185,16 @@ EXTERN void uip_udpcallback(struct uip_driver_s *dev,
 #endif /* CONFIG_NET_UDP */
 
 #ifdef CONFIG_NET_ICMP
-/* Defined in uip-icmpinput.c ***********************************************/
+/* Defined in uip_icmpinput.c ***********************************************/
 
 EXTERN void uip_icmpinput(struct uip_driver_s *dev);
 
 #ifdef CONFIG_NET_ICMP_PING
-/* Defined in uip-icmpoll.c *************************************************/
+/* Defined in uip_icmpoll.c *************************************************/
 
 EXTERN void uip_icmppoll(struct uip_driver_s *dev);
 
-/* Defined in uip-icmsend.c *************************************************/
+/* Defined in uip_icmsend.c *************************************************/
 
 EXTERN void uip_icmpsend(struct uip_driver_s *dev, uip_ipaddr_t *destaddr);
 
diff --git a/nuttx/net/uip/uip-listen.c b/nuttx/net/uip/uip_listen.c
index 9ab3eae72..f93501927 100644
--- a/nuttx/net/uip/uip-listen.c
+++ b/nuttx/net/uip/uip_listen.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/uip/uip-listen.c
+ * net/uip/uip_listen.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * A direct leverage of logic from uIP which also has b BSD style license
@@ -49,7 +49,7 @@
 
 #include <net/uip/uipopt.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Private Data
diff --git a/nuttx/net/uip/uip-neighbor.c b/nuttx/net/uip/uip_neighbor.c
index a864178b4..4091ace41 100644
--- a/nuttx/net/uip/uip-neighbor.c
+++ b/nuttx/net/uip/uip_neighbor.c
@@ -1,5 +1,5 @@
 /*
- * uip-neighbor.c
+ * uip_neighbor.c
  * Database of link-local neighbors, used by IPv6 code and to be used by
  * a future ARP code rewrite.
  *
@@ -35,7 +35,7 @@
 #include <string.h>
 #include <debug.h>
 
-#include "uip-neighbor.h"
+#include "uip_neighbor.h"
 
 #define MAX_TIME 128
 
diff --git a/nuttx/net/uip/uip-neighbor.h b/nuttx/net/uip/uip_neighbor.h
index f939b1710..0e180bac7 100644
--- a/nuttx/net/uip/uip-neighbor.h
+++ b/nuttx/net/uip/uip_neighbor.h
@@ -1,4 +1,4 @@
-/* uip-neighbor.h
+/* uip_neighbor.h
  * Header file for database of link-local neighbors, used by IPv6 code and
  * to be used by future ARP code.
  * Author: Adam Dunkels <adam@sics.se>
diff --git a/nuttx/net/uip/uip-poll.c b/nuttx/net/uip/uip_poll.c
index d05e9f58f..bec184d24 100644
--- a/nuttx/net/uip/uip-poll.c
+++ b/nuttx/net/uip/uip_poll.c
@@ -1,10 +1,9 @@
 /****************************************************************************
- * net/uip/uip-poll.c
+ * net/uip/uip_poll.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -48,7 +47,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Private Data
diff --git a/nuttx/net/uip/uip-send.c b/nuttx/net/uip/uip_send.c
index 6e83cb0d8..2c8044e15 100644
--- a/nuttx/net/uip/uip-send.c
+++ b/nuttx/net/uip/uip_send.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * uip-send.c
+ * net/uip/uip_send.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007i, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Based in part on uIP which also has a BSD stylie license:
diff --git a/nuttx/net/uip/uip-setipid.c b/nuttx/net/uip/uip_setipid.c
index 5726c7c7a..8bf40e0cc 100644
--- a/nuttx/net/uip/uip-setipid.c
+++ b/nuttx/net/uip/uip_setipid.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip-setipid.c
+ * net/uip/uip_setipid.c
  *
  *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -46,7 +46,7 @@
 
 #include <net/uip/uip.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Private Data
diff --git a/nuttx/net/uip/uip-tcpappsend.c b/nuttx/net/uip/uip_tcpappsend.c
index 93f840b02..1d6bb7a67 100644
--- a/nuttx/net/uip/uip-tcpappsend.c
+++ b/nuttx/net/uip/uip_tcpappsend.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/uip/uip-tcpappsend.c
+ * net/uip/uip_tcpappsend.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Adapted for NuttX from logic in uIP which also has a BSD-like license:
@@ -51,7 +51,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/uip/uip-tcpbacklog.c b/nuttx/net/uip/uip_tcpbacklog.c
index cffbad7c7..1eecdf9ad 100644
--- a/nuttx/net/uip/uip-tcpbacklog.c
+++ b/nuttx/net/uip/uip_tcpbacklog.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip-tcpbacklog.c
+ * net/uip/uip_tcpbacklog.c
  *
  *   Copyright (C) 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
@@ -49,7 +49,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-tcp.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Private Data
diff --git a/nuttx/net/uip/uip-tcpcallback.c b/nuttx/net/uip/uip_tcpcallback.c
index 1ee61ad29..45c970a90 100644
--- a/nuttx/net/uip/uip-tcpcallback.c
+++ b/nuttx/net/uip/uip_tcpcallback.c
@@ -1,10 +1,9 @@
 /****************************************************************************
- * net/uip/uip-tcpcallback.c
+ * net/uip/uip_tcpcallback.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -49,7 +48,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Private Data
diff --git a/nuttx/net/uip/uip-tcpconn.c b/nuttx/net/uip/uip_tcpconn.c
index e36520b05..ea8c308af 100644
--- a/nuttx/net/uip/uip-tcpconn.c
+++ b/nuttx/net/uip/uip_tcpconn.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * uip_tcpconn.c
+ * net/uip/uip_tcpconn.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Large parts of this file were leveraged from uIP logic:
@@ -58,7 +58,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Public Data
diff --git a/nuttx/net/uip/uip-tcpinput.c b/nuttx/net/uip/uip_tcpinput.c
index 5d220aeb5..cab58e48d 100644
--- a/nuttx/net/uip/uip-tcpinput.c
+++ b/nuttx/net/uip/uip_tcpinput.c
@@ -1,8 +1,8 @@
 /****************************************************************************
- * net/uip/uip-tcpinput.c
+ * net/uip/uip_tcpinput.c
  * Handling incoming TCP input
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Adapted for NuttX from logic in uIP which also has a BSD-like license:
@@ -53,7 +53,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/uip/uip-tcppoll.c b/nuttx/net/uip/uip_tcppoll.c
index 18aa9541d..66a49f953 100644
--- a/nuttx/net/uip/uip-tcppoll.c
+++ b/nuttx/net/uip/uip_tcppoll.c
@@ -1,8 +1,8 @@
 /****************************************************************************
- * net/uip/uip-tcppoll.c
+ * net/uip/uip_tcppoll.c
  * Poll for the availability of TCP TX data
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Adapted for NuttX from logic in uIP which also has a BSD-like license:
@@ -52,7 +52,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/uip/uip-tcpreadahead.c b/nuttx/net/uip/uip_tcpreadahead.c
index c00ea7b38..b94edc2f7 100644
--- a/nuttx/net/uip/uip-tcpreadahead.c
+++ b/nuttx/net/uip/uip_tcpreadahead.c
@@ -1,10 +1,9 @@
 /****************************************************************************
- * net/uip/uip-tcpreadahead.c
+ * net/uip/uip_tcpreadahead.c
  *
  *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -47,7 +46,7 @@
 
 #include <net/uip/uip.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Private Data
diff --git a/nuttx/net/uip/uip-tcpsend.c b/nuttx/net/uip/uip_tcpsend.c
index 17cc6fc92..d7e48f1f7 100644
--- a/nuttx/net/uip/uip-tcpsend.c
+++ b/nuttx/net/uip/uip_tcpsend.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/uip/uip-tcpsend.c
+ * net/uip/uip_tcpsend.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Adapted for NuttX from logic in uIP which also has a BSD-like license:
@@ -52,7 +52,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/uip/uip-tcptimer.c b/nuttx/net/uip/uip_tcptimer.c
index aadd2b5ea..29cad8009 100644
--- a/nuttx/net/uip/uip-tcptimer.c
+++ b/nuttx/net/uip/uip_tcptimer.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip-tcptimer.c
+ * net/uip/uip_tcptimer.c
  * Poll for the availability of TCP TX data
  *
  *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
@@ -52,7 +52,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/uip/uip-udpcallback.c b/nuttx/net/uip/uip_udpcallback.c
index a3a254fd2..1f980ae2f 100644
--- a/nuttx/net/uip/uip-udpcallback.c
+++ b/nuttx/net/uip/uip_udpcallback.c
@@ -1,10 +1,9 @@
 /****************************************************************************
- * net/uip/uip-udpcallback.c
+ * net/uip/uip_udpcallback.c
  *
  *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
- *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -48,7 +47,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Private Data
diff --git a/nuttx/net/uip/uip-udpconn.c b/nuttx/net/uip/uip_udpconn.c
index 88d41cdc4..a1a12993c 100644
--- a/nuttx/net/uip/uip-udpconn.c
+++ b/nuttx/net/uip/uip_udpconn.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/uip/uip-udpconn.c
+ * net/uip/uip_udpconn.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Large parts of this file were leveraged from uIP logic:
@@ -60,7 +60,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Private Data
diff --git a/nuttx/net/uip/uip-udpinput.c b/nuttx/net/uip/uip_udpinput.c
index 45863d9c8..b9003cd86 100644
--- a/nuttx/net/uip/uip-udpinput.c
+++ b/nuttx/net/uip/uip_udpinput.c
@@ -1,8 +1,8 @@
 /****************************************************************************
- * net/uip/uip-udpinput.c
+ * net/uip/uip_udpinput.c
  * Handling incoming UDP input
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Adapted for NuttX from logic in uIP which also has a BSD-like license:
@@ -52,7 +52,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/uip/uip-udppoll.c b/nuttx/net/uip/uip_udppoll.c
index 649190b29..f64b53403 100644
--- a/nuttx/net/uip/uip-udppoll.c
+++ b/nuttx/net/uip/uip_udppoll.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * net/uip/uip-udppoll.c
+ * net/uip/uip_udppoll.c
  * Poll for the availability of UDP TX data
  *
  *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
@@ -52,7 +52,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Definitions
diff --git a/nuttx/net/uip/uip-udpsend.c b/nuttx/net/uip/uip_udpsend.c
index 79ab36856..9e6a95a38 100644
--- a/nuttx/net/uip/uip-udpsend.c
+++ b/nuttx/net/uip/uip_udpsend.c
@@ -1,7 +1,7 @@
 /****************************************************************************
- * net/uip/uip-udpsend.c
+ * net/uip/uip_udpsend.c
  *
- *   Copyright (C) 2007 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
  *
  * Adapted for NuttX from logic in uIP which also has a BSD-like license:
@@ -51,7 +51,7 @@
 #include <net/uip/uip.h>
 #include <net/uip/uip-arch.h>
 
-#include "uip-internal.h"
+#include "uip_internal.h"
 
 /****************************************************************************
  * Definitions