natVMPipeEcos.cc: Renamed from gnu/java/nio/natPipeImplEcos.cc.

2007-01-18  Gary Benson  <gbenson@redhat.com>

	* gnu/java/nio/natVMPipeEcos.cc:
	Renamed from gnu/java/nio/natPipeImplEcos.cc.
	* gnu/java/nio/natVMPipePosix.cc:
	Renamed from gnu/java/nio/natPipeImplPosix.cc.
	* gnu/java/nio/natVMPipeWin32.cc:
	Renamed from gnu/java/nio/natPipeImplWin32.cc.
	* gnu/java/nio/natVMSelectorEcos.cc:
	Renamed from gnu/java/nio/natSelectorImplEcos.cc.
	* gnu/java/nio/natVMSelectorPosix.cc:
	Renamed from gnu/java/nio/natSelectorImplPosix.cc.
	* gnu/java/nio/natVMSelectorWin32.cc:
	Renamed from gnu/java/nio/natSelectorImplWin32.cc.
	* java/io/natVMObjectInputStream.cc:
	Renamed from java/io/natObjectInputStream.cc.
	* java/lang/natVMDouble.cc:
	Renamed from java/lang/natDouble.cc.
	* java/lang/natVMFloat.cc:
	Renamed from java/lang/natFloat.cc.	
	* Makefile.am, configure.ac: Reflect the above.
	* Makefile.in, configure: Rebuilt.

From-SVN: r120895

14 files changed, 93 insertions, 64 deletions

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3cc61ab..4cecf1b 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,26 @@
+2007-01-18  Gary Benson  <gbenson@redhat.com>
+
+	* gnu/java/nio/natVMPipeEcos.cc:
+	Renamed from gnu/java/nio/natPipeImplEcos.cc.
+	* gnu/java/nio/natVMPipePosix.cc:
+	Renamed from gnu/java/nio/natPipeImplPosix.cc.
+	* gnu/java/nio/natVMPipeWin32.cc:
+	Renamed from gnu/java/nio/natPipeImplWin32.cc.
+	* gnu/java/nio/natVMSelectorEcos.cc:
+	Renamed from gnu/java/nio/natSelectorImplEcos.cc.
+	* gnu/java/nio/natVMSelectorPosix.cc:
+	Renamed from gnu/java/nio/natSelectorImplPosix.cc.
+	* gnu/java/nio/natVMSelectorWin32.cc:
+	Renamed from gnu/java/nio/natSelectorImplWin32.cc.
+	* java/io/natVMObjectInputStream.cc:
+	Renamed from java/io/natObjectInputStream.cc.
+	* java/lang/natVMDouble.cc:
+	Renamed from java/lang/natDouble.cc.
+	* java/lang/natVMFloat.cc:
+	Renamed from java/lang/natFloat.cc.	
+	* Makefile.am, configure.ac: Reflect the above.
+	* Makefile.in, configure: Rebuilt.
+
 2007-01-17  Andrew Haley  <aph@redhat.com>
 
 	* Makefile.in: Rebuilt.
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index d28f6fa..a89a7f3 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -835,21 +835,21 @@ gnu/java/lang/management/natVMThreadMXBeanImpl.cc \
 gnu/java/net/natPlainDatagramSocketImpl.cc \
 gnu/java/net/natPlainSocketImpl.cc \
 gnu/java/net/protocol/core/natCoreInputStream.cc \
-gnu/java/nio/natPipeImpl.cc \
-gnu/java/nio/natSelectorImpl.cc \
+gnu/java/nio/natVMPipe.cc \
+gnu/java/nio/natVMSelector.cc \
 gnu/java/nio/natNIOServerSocket.cc \
 gnu/java/nio/natVMChannel.cc \
 gnu/java/nio/channels/natFileChannelImpl.cc \
 java/io/natFile.cc \
-java/io/natObjectInputStream.cc \
+java/io/natVMObjectInputStream.cc \
 java/io/natVMObjectStreamClass.cc \
 java/lang/management/natVMManagementFactory.cc \
 java/lang/natCharacter.cc \
 java/lang/natClass.cc \
 java/lang/natClassLoader.cc \
 java/lang/natConcreteProcess.cc \
-java/lang/natDouble.cc \
-java/lang/natFloat.cc \
+java/lang/natVMDouble.cc \
+java/lang/natVMFloat.cc \
 java/lang/natMath.cc \
 java/lang/natObject.cc \
 java/lang/natRuntime.cc	\
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 5ca8be5..e3fac10 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -106,7 +106,7 @@ CONFIG_CLEAN_FILES = libgcj.pc libgcj.spec libgcj-test.spec \
 	java/net/natVMInetAddress.cc java/net/natVMNetworkInterface.cc \
 	gnu/java/net/natPlainSocketImpl.cc \
 	gnu/java/net/natPlainDatagramSocketImpl.cc \
-	gnu/java/nio/natPipeImpl.cc gnu/java/nio/natSelectorImpl.cc \
+	gnu/java/nio/natVMPipe.cc gnu/java/nio/natVMSelector.cc \
 	gnu/java/nio/channels/natFileChannelImpl.cc sysdep/locks.h \
 	sysdep/backtrace.h sysdep/descriptor.h
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -307,16 +307,16 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc jvmti.cc exception.cc \
 	gnu/java/net/natPlainDatagramSocketImpl.cc \
 	gnu/java/net/natPlainSocketImpl.cc \
 	gnu/java/net/protocol/core/natCoreInputStream.cc \
-	gnu/java/nio/natPipeImpl.cc gnu/java/nio/natSelectorImpl.cc \
+	gnu/java/nio/natVMPipe.cc gnu/java/nio/natVMSelector.cc \
 	gnu/java/nio/natNIOServerSocket.cc \
 	gnu/java/nio/natVMChannel.cc \
 	gnu/java/nio/channels/natFileChannelImpl.cc java/io/natFile.cc \
-	java/io/natObjectInputStream.cc \
+	java/io/natVMObjectInputStream.cc \
 	java/io/natVMObjectStreamClass.cc \
 	java/lang/management/natVMManagementFactory.cc \
 	java/lang/natCharacter.cc java/lang/natClass.cc \
 	java/lang/natClassLoader.cc java/lang/natConcreteProcess.cc \
-	java/lang/natDouble.cc java/lang/natFloat.cc \
+	java/lang/natVMDouble.cc java/lang/natVMFloat.cc \
 	java/lang/natMath.cc java/lang/natObject.cc \
 	java/lang/natRuntime.cc java/lang/natString.cc \
 	java/lang/natStringBuffer.cc java/lang/natStringBuilder.cc \
@@ -370,16 +370,16 @@ am__objects_2 = gnu/classpath/jdwp/natVMFrame.lo \
 	gnu/java/net/natPlainDatagramSocketImpl.lo \
 	gnu/java/net/natPlainSocketImpl.lo \
 	gnu/java/net/protocol/core/natCoreInputStream.lo \
-	gnu/java/nio/natPipeImpl.lo gnu/java/nio/natSelectorImpl.lo \
+	gnu/java/nio/natVMPipe.lo gnu/java/nio/natVMSelector.lo \
 	gnu/java/nio/natNIOServerSocket.lo \
 	gnu/java/nio/natVMChannel.lo \
 	gnu/java/nio/channels/natFileChannelImpl.lo java/io/natFile.lo \
-	java/io/natObjectInputStream.lo \
+	java/io/natVMObjectInputStream.lo \
 	java/io/natVMObjectStreamClass.lo \
 	java/lang/management/natVMManagementFactory.lo \
 	java/lang/natCharacter.lo java/lang/natClass.lo \
 	java/lang/natClassLoader.lo java/lang/natConcreteProcess.lo \
-	java/lang/natDouble.lo java/lang/natFloat.lo \
+	java/lang/natVMDouble.lo java/lang/natVMFloat.lo \
 	java/lang/natMath.lo java/lang/natObject.lo \
 	java/lang/natRuntime.lo java/lang/natString.lo \
 	java/lang/natStringBuffer.lo java/lang/natStringBuilder.lo \
@@ -7920,21 +7920,21 @@ gnu/java/lang/management/natVMThreadMXBeanImpl.cc \
 gnu/java/net/natPlainDatagramSocketImpl.cc \
 gnu/java/net/natPlainSocketImpl.cc \
 gnu/java/net/protocol/core/natCoreInputStream.cc \
-gnu/java/nio/natPipeImpl.cc \
-gnu/java/nio/natSelectorImpl.cc \
+gnu/java/nio/natVMPipe.cc \
+gnu/java/nio/natVMSelector.cc \
 gnu/java/nio/natNIOServerSocket.cc \
 gnu/java/nio/natVMChannel.cc \
 gnu/java/nio/channels/natFileChannelImpl.cc \
 java/io/natFile.cc \
-java/io/natObjectInputStream.cc \
+java/io/natVMObjectInputStream.cc \
 java/io/natVMObjectStreamClass.cc \
 java/lang/management/natVMManagementFactory.cc \
 java/lang/natCharacter.cc \
 java/lang/natClass.cc \
 java/lang/natClassLoader.cc \
 java/lang/natConcreteProcess.cc \
-java/lang/natDouble.cc \
-java/lang/natFloat.cc \
+java/lang/natVMDouble.cc \
+java/lang/natVMFloat.cc \
 java/lang/natMath.cc \
 java/lang/natObject.cc \
 java/lang/natRuntime.cc	\
@@ -8385,9 +8385,9 @@ gnu/java/nio/$(am__dirstamp):
 gnu/java/nio/$(DEPDIR)/$(am__dirstamp):
 	@$(mkdir_p) gnu/java/nio/$(DEPDIR)
 	@: > gnu/java/nio/$(DEPDIR)/$(am__dirstamp)
-gnu/java/nio/natPipeImpl.lo: gnu/java/nio/$(am__dirstamp) \
+gnu/java/nio/natVMPipe.lo: gnu/java/nio/$(am__dirstamp) \
 	gnu/java/nio/$(DEPDIR)/$(am__dirstamp)
-gnu/java/nio/natSelectorImpl.lo: gnu/java/nio/$(am__dirstamp) \
+gnu/java/nio/natVMSelector.lo: gnu/java/nio/$(am__dirstamp) \
 	gnu/java/nio/$(DEPDIR)/$(am__dirstamp)
 gnu/java/nio/natNIOServerSocket.lo: gnu/java/nio/$(am__dirstamp) \
 	gnu/java/nio/$(DEPDIR)/$(am__dirstamp)
@@ -8410,7 +8410,7 @@ java/io/$(DEPDIR)/$(am__dirstamp):
 	@: > java/io/$(DEPDIR)/$(am__dirstamp)
 java/io/natFile.lo: java/io/$(am__dirstamp) \
 	java/io/$(DEPDIR)/$(am__dirstamp)
-java/io/natObjectInputStream.lo: java/io/$(am__dirstamp) \
+java/io/natVMObjectInputStream.lo: java/io/$(am__dirstamp) \
 	java/io/$(DEPDIR)/$(am__dirstamp)
 java/io/natVMObjectStreamClass.lo: java/io/$(am__dirstamp) \
 	java/io/$(DEPDIR)/$(am__dirstamp)
@@ -8437,9 +8437,9 @@ java/lang/natClassLoader.lo: java/lang/$(am__dirstamp) \
 	java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natConcreteProcess.lo: java/lang/$(am__dirstamp) \
 	java/lang/$(DEPDIR)/$(am__dirstamp)
-java/lang/natDouble.lo: java/lang/$(am__dirstamp) \
+java/lang/natVMDouble.lo: java/lang/$(am__dirstamp) \
 	java/lang/$(DEPDIR)/$(am__dirstamp)
-java/lang/natFloat.lo: java/lang/$(am__dirstamp) \
+java/lang/natVMFloat.lo: java/lang/$(am__dirstamp) \
 	java/lang/$(DEPDIR)/$(am__dirstamp)
 java/lang/natMath.lo: java/lang/$(am__dirstamp) \
 	java/lang/$(DEPDIR)/$(am__dirstamp)
@@ -8855,16 +8855,16 @@ mostlyclean-compile:
 	-rm -f gnu/java/nio/channels/natFileChannelImpl.lo
 	-rm -f gnu/java/nio/natNIOServerSocket.$(OBJEXT)
 	-rm -f gnu/java/nio/natNIOServerSocket.lo
-	-rm -f gnu/java/nio/natPipeImpl.$(OBJEXT)
-	-rm -f gnu/java/nio/natPipeImpl.lo
-	-rm -f gnu/java/nio/natSelectorImpl.$(OBJEXT)
-	-rm -f gnu/java/nio/natSelectorImpl.lo
 	-rm -f gnu/java/nio/natVMChannel.$(OBJEXT)
 	-rm -f gnu/java/nio/natVMChannel.lo
+	-rm -f gnu/java/nio/natVMPipe.$(OBJEXT)
+	-rm -f gnu/java/nio/natVMPipe.lo
+	-rm -f gnu/java/nio/natVMSelector.$(OBJEXT)
+	-rm -f gnu/java/nio/natVMSelector.lo
 	-rm -f java/io/natFile.$(OBJEXT)
 	-rm -f java/io/natFile.lo
-	-rm -f java/io/natObjectInputStream.$(OBJEXT)
-	-rm -f java/io/natObjectInputStream.lo
+	-rm -f java/io/natVMObjectInputStream.$(OBJEXT)
+	-rm -f java/io/natVMObjectInputStream.lo
 	-rm -f java/io/natVMObjectStreamClass.$(OBJEXT)
 	-rm -f java/io/natVMObjectStreamClass.lo
 	-rm -f java/lang/Object.$(OBJEXT)
@@ -8879,10 +8879,6 @@ mostlyclean-compile:
 	-rm -f java/lang/natClassLoader.lo
 	-rm -f java/lang/natConcreteProcess.$(OBJEXT)
 	-rm -f java/lang/natConcreteProcess.lo
-	-rm -f java/lang/natDouble.$(OBJEXT)
-	-rm -f java/lang/natDouble.lo
-	-rm -f java/lang/natFloat.$(OBJEXT)
-	-rm -f java/lang/natFloat.lo
 	-rm -f java/lang/natMath.$(OBJEXT)
 	-rm -f java/lang/natMath.lo
 	-rm -f java/lang/natObject.$(OBJEXT)
@@ -8903,6 +8899,10 @@ mostlyclean-compile:
 	-rm -f java/lang/natThreadLocal.lo
 	-rm -f java/lang/natVMClassLoader.$(OBJEXT)
 	-rm -f java/lang/natVMClassLoader.lo
+	-rm -f java/lang/natVMDouble.$(OBJEXT)
+	-rm -f java/lang/natVMDouble.lo
+	-rm -f java/lang/natVMFloat.$(OBJEXT)
+	-rm -f java/lang/natVMFloat.lo
 	-rm -f java/lang/natVMThrowable.$(OBJEXT)
 	-rm -f java/lang/natVMThrowable.lo
 	-rm -f java/lang/ref/natReference.$(OBJEXT)
@@ -9029,20 +9029,18 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/net/$(DEPDIR)/natPlainSocketImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/net/protocol/core/$(DEPDIR)/natCoreInputStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natNIOServerSocket.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natPipeImpl.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natSelectorImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natVMChannel.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natVMPipe.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/$(DEPDIR)/natVMSelector.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/java/nio/channels/$(DEPDIR)/natFileChannelImpl.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natFile.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natObjectInputStream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMObjectInputStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/io/$(DEPDIR)/natVMObjectStreamClass.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/Object.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natCharacter.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natClass.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natClassLoader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natConcreteProcess.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natDouble.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natFloat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natMath.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natObject.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natRuntime.Plo@am__quote@
@@ -9053,6 +9051,8 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natThread.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natThreadLocal.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMClassLoader.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMDouble.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMFloat.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/$(DEPDIR)/natVMThrowable.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/management/$(DEPDIR)/natVMManagementFactory.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@java/lang/ref/$(DEPDIR)/natReference.Plo@am__quote@
diff --git a/libjava/configure b/libjava/configure
index 4e2e1fc..7cd8c71 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -7682,12 +7682,14 @@ test -d gnu/java/net || mkdir gnu/java/net
           ac_config_links="$ac_config_links gnu/java/net/natPlainDatagramSocketImpl.cc:gnu/java/net/natPlainDatagramSocketImpl${PLATFORMNET}.cc"
 
 
-# Likewise for natPipeImpl.cc and natSelectorImpl.cc.
+# Likewise for natVMPipe.cc and natVMSelector.cc.
 test -d gnu/java/nio || mkdir gnu/java/nio
-          ac_config_links="$ac_config_links gnu/java/nio/natPipeImpl.cc:gnu/java/nio/natPipeImpl${PLATFORM}.cc"
+          ac_config_links="$ac_config_links gnu/java/nio/natVMPipe.cc:gnu/java/nio/natVMPipe${PLATFORM}.cc"
 
-          ac_config_links="$ac_config_links gnu/java/nio/natSelectorImpl.cc:gnu/java/nio/natSelectorImpl${PLATFORM}.cc"
+          ac_config_links="$ac_config_links gnu/java/nio/natVMSelector.cc:gnu/java/nio/natVMSelector${PLATFORM}.cc"
 
+
+# Likewise for natFileChannelImpl.cc
 test -d gnu/java/nio/channels || mkdir gnu/java/nio/channels
           ac_config_links="$ac_config_links gnu/java/nio/channels/natFileChannelImpl.cc:gnu/java/nio/channels/natFileChannel${FILE-${PLATFORM}}.cc"
 
@@ -17846,8 +17848,8 @@ do
   "java/net/natVMNetworkInterface.cc" ) CONFIG_LINKS="$CONFIG_LINKS java/net/natVMNetworkInterface.cc:java/net/natVMNetworkInterface${PLATFORMNET}.cc" ;;
   "gnu/java/net/natPlainSocketImpl.cc" ) CONFIG_LINKS="$CONFIG_LINKS gnu/java/net/natPlainSocketImpl.cc:gnu/java/net/natPlainSocketImpl${PLATFORMNET}.cc" ;;
   "gnu/java/net/natPlainDatagramSocketImpl.cc" ) CONFIG_LINKS="$CONFIG_LINKS gnu/java/net/natPlainDatagramSocketImpl.cc:gnu/java/net/natPlainDatagramSocketImpl${PLATFORMNET}.cc" ;;
-  "gnu/java/nio/natPipeImpl.cc" ) CONFIG_LINKS="$CONFIG_LINKS gnu/java/nio/natPipeImpl.cc:gnu/java/nio/natPipeImpl${PLATFORM}.cc" ;;
-  "gnu/java/nio/natSelectorImpl.cc" ) CONFIG_LINKS="$CONFIG_LINKS gnu/java/nio/natSelectorImpl.cc:gnu/java/nio/natSelectorImpl${PLATFORM}.cc" ;;
+  "gnu/java/nio/natVMPipe.cc" ) CONFIG_LINKS="$CONFIG_LINKS gnu/java/nio/natVMPipe.cc:gnu/java/nio/natVMPipe${PLATFORM}.cc" ;;
+  "gnu/java/nio/natVMSelector.cc" ) CONFIG_LINKS="$CONFIG_LINKS gnu/java/nio/natVMSelector.cc:gnu/java/nio/natVMSelector${PLATFORM}.cc" ;;
   "gnu/java/nio/channels/natFileChannelImpl.cc" ) CONFIG_LINKS="$CONFIG_LINKS gnu/java/nio/channels/natFileChannelImpl.cc:gnu/java/nio/channels/natFileChannel${FILE-${PLATFORM}}.cc" ;;
   "include/java-gc.h" ) CONFIG_LINKS="$CONFIG_LINKS include/java-gc.h:include/$GCHDR" ;;
   "include/java-threads.h" ) CONFIG_LINKS="$CONFIG_LINKS include/java-threads.h:include/$THREADH" ;;
diff --git a/libjava/configure.ac b/libjava/configure.ac
index b800750..5f2eb63 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -724,10 +724,12 @@ test -d gnu/java/net || mkdir gnu/java/net
 AC_CONFIG_LINKS(gnu/java/net/natPlainSocketImpl.cc:gnu/java/net/natPlainSocketImpl${PLATFORMNET}.cc)
 AC_CONFIG_LINKS(gnu/java/net/natPlainDatagramSocketImpl.cc:gnu/java/net/natPlainDatagramSocketImpl${PLATFORMNET}.cc)
 
-# Likewise for natPipeImpl.cc and natSelectorImpl.cc.
+# Likewise for natVMPipe.cc and natVMSelector.cc.
 test -d gnu/java/nio || mkdir gnu/java/nio
-AC_CONFIG_LINKS(gnu/java/nio/natPipeImpl.cc:gnu/java/nio/natPipeImpl${PLATFORM}.cc)
-AC_CONFIG_LINKS(gnu/java/nio/natSelectorImpl.cc:gnu/java/nio/natSelectorImpl${PLATFORM}.cc)
+AC_CONFIG_LINKS(gnu/java/nio/natVMPipe.cc:gnu/java/nio/natVMPipe${PLATFORM}.cc)
+AC_CONFIG_LINKS(gnu/java/nio/natVMSelector.cc:gnu/java/nio/natVMSelector${PLATFORM}.cc)
+
+# Likewise for natFileChannelImpl.cc
 test -d gnu/java/nio/channels || mkdir gnu/java/nio/channels
 AC_CONFIG_LINKS(gnu/java/nio/channels/natFileChannelImpl.cc:gnu/java/nio/channels/natFileChannel${FILE-${PLATFORM}}.cc)
 
diff --git a/libjava/gnu/java/nio/natPipeImplEcos.cc b/libjava/gnu/java/nio/natVMPipeEcos.cc
index 75af4eb..c806fb4 100644
--- a/libjava/gnu/java/nio/natPipeImplEcos.cc
+++ b/libjava/gnu/java/nio/natVMPipeEcos.cc
@@ -1,6 +1,6 @@
-// natPipeImplEcos.cc
+// natVMPipeImplEcos.cc
 
-/* Copyright (C) 2003, 2004  Free Software Foundation
+/* Copyright (C) 2003, 2004, 2007  Free Software Foundation
 
    This file is part of libgcj.
 
diff --git a/libjava/gnu/java/nio/natPipeImplPosix.cc b/libjava/gnu/java/nio/natVMPipePosix.cc
index 1726dc7..3de136a 100644
--- a/libjava/gnu/java/nio/natPipeImplPosix.cc
+++ b/libjava/gnu/java/nio/natVMPipePosix.cc
@@ -1,6 +1,6 @@
-// natPipeImplPosix.cc
+// natVMPipeImplPosix.cc
 
-/* Copyright (C) 2003, 2004  Free Software Foundation
+/* Copyright (C) 2003, 2004, 2007  Free Software Foundation
 
    This file is part of libgcj.
 
diff --git a/libjava/gnu/java/nio/natPipeImplWin32.cc b/libjava/gnu/java/nio/natVMPipeWin32.cc
index 2f14b50..5278c7a 100644
--- a/libjava/gnu/java/nio/natPipeImplWin32.cc
+++ b/libjava/gnu/java/nio/natVMPipeWin32.cc
@@ -1,6 +1,6 @@
-// natPipeImplWin32.cc
+// natVMPipeImplWin32.cc
 
-/* Copyright (C) 2003, 2004  Free Software Foundation
+/* Copyright (C) 2003, 2004, 2007  Free Software Foundation
 
    This file is part of libgcj.
 
diff --git a/libjava/gnu/java/nio/natSelectorImplEcos.cc b/libjava/gnu/java/nio/natVMSelectorEcos.cc
index 15fbafd..f2ebff8 100644
--- a/libjava/gnu/java/nio/natSelectorImplEcos.cc
+++ b/libjava/gnu/java/nio/natVMSelectorEcos.cc
@@ -1,6 +1,6 @@
-// natSelectorImplEcos.cc
+// natVMSelectorImplEcos.cc
 
-/* Copyright (C) 2003, 2004  Free Software Foundation
+/* Copyright (C) 2003, 2004, 2007  Free Software Foundation
 
    This file is part of libgcj.
 
diff --git a/libjava/gnu/java/nio/natSelectorImplPosix.cc b/libjava/gnu/java/nio/natVMSelectorPosix.cc
index b433900..9f02679 100644
--- a/libjava/gnu/java/nio/natSelectorImplPosix.cc
+++ b/libjava/gnu/java/nio/natVMSelectorPosix.cc
@@ -1,6 +1,6 @@
-// natSelectorImplPosix.cc
+// natVMSelectorImplPosix.cc
 
-/* Copyright (C) 2002, 2003, 2004  Free Software Foundation
+/* Copyright (C) 2002, 2003, 2004, 2007  Free Software Foundation
 
    This file is part of libgcj.
 
diff --git a/libjava/gnu/java/nio/natSelectorImplWin32.cc b/libjava/gnu/java/nio/natVMSelectorWin32.cc
index 860f654..790de22 100644
--- a/libjava/gnu/java/nio/natSelectorImplWin32.cc
+++ b/libjava/gnu/java/nio/natVMSelectorWin32.cc
@@ -1,6 +1,6 @@
-// natSelectorImplWin32.cc
+// natVMSelectorImplWin32.cc
 
-/* Copyright (C) 2003, 2004  Free Software Foundation
+/* Copyright (C) 2003, 2004, 2007  Free Software Foundation
 
    This file is part of libgcj.
 
diff --git a/libjava/java/io/natObjectInputStream.cc b/libjava/java/io/natVMObjectInputStream.cc
index 6212396..86410a4 100644
--- a/libjava/java/io/natObjectInputStream.cc
+++ b/libjava/java/io/natVMObjectInputStream.cc
@@ -1,8 +1,9 @@
-// natObjectInputStream.cc - Native part of VMObjectInputStream class.
+// natVMObjectInputStream.cc - Native part of VMObjectInputStream class.
 
-/* Copyright (C) 1998, 1999, 2000, 2001, 2005, 2006  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001, 2005, 2006, 2007
+   Free Software Foundation
 
-   This ObjectInputStream is part of libgcj.
+   This file is part of libgcj.
 
 This software is copyrighted work licensed under the terms of the
 Libgcj License.  Please consult the ObjectInputStream "LIBGCJ_LICENSE" for
diff --git a/libjava/java/lang/natDouble.cc b/libjava/java/lang/natVMDouble.cc
index 87123bc..f770bc4 100644
--- a/libjava/java/lang/natDouble.cc
+++ b/libjava/java/lang/natVMDouble.cc
@@ -1,6 +1,7 @@
-// natDouble.cc - Implementation of java.lang.VMDouble native methods.
+// natVMDouble.cc - Implementation of java.lang.VMDouble native methods.
 
-/* Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2006, 2007  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001, 2003, 2005, 2006, 2007
+   Free Software Foundation
 
    This file is part of libgcj.
 
diff --git a/libjava/java/lang/natFloat.cc b/libjava/java/lang/natVMFloat.cc
index f090b81..54ae519 100644
--- a/libjava/java/lang/natFloat.cc
+++ b/libjava/java/lang/natVMFloat.cc
@@ -1,6 +1,6 @@
-// natFloat.cc - Implementation of java.lang.VMFloat native methods.
+// natVMFloat.cc - Implementation of java.lang.VMFloat native methods.
 
-/* Copyright (C) 1998, 1999, 2001, 2006  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2001, 2006, 2007  Free Software Foundation
 
    This file is part of libgcj.