23 files changed, 26 insertions, 26 deletions
diff --git a/INSTALL b/INSTALL
index 88525b94e3..9e0299035a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1860,7 +1860,7 @@ If your system is quite busy and doesn't respond quickly enough,
 these tests might fail.  If possible, try running the tests again
 with the system under a lighter load.  These timing-sensitive
 and load-sensitive tests include F<t/op/alarm.t>,
-F<ext/Time/HiRes/t/HiRes.t>, F<ext/threads/shared/t/waithires.t>,
+F<ext/Time-HiRes/t/HiRes.t>, F<ext/threads/shared/t/waithires.t>,
 F<ext/threads/shared/t/stress.t>, F<lib/Benchmark.t>,
 F<lib/Memoize/t/expmod_t.t>, and F<lib/Memoize/t/speed.t>.
 
diff --git a/MANIFEST b/MANIFEST
index 260ce2efac..00cf12247e 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1352,22 +1352,22 @@ ext/threads/t/stress_cv.t	Test with multiple threads, coderef cv argument.
 ext/threads/t/stress_re.t	Test with multiple threads, string cv argument and regexes.
 ext/threads/t/stress_string.t	Test with multiple threads, string cv argument.
 ext/threads/t/thread.t		General ithread tests from thr5005
-ext/Time/HiRes/Changes		Time::HiRes extension
-ext/Time/HiRes/fallback/const-c.inc	Time::HiRes extension
-ext/Time/HiRes/fallback/const-xs.inc	Time::HiRes extension
-ext/Time/HiRes/hints/aix.pl	Hint for Time::HiRes for named architecture
-ext/Time/HiRes/hints/dec_osf.pl		Hint for Time::HiRes for named architecture
-ext/Time/HiRes/hints/dynixptx.pl	Hint for Time::HiRes for named architecture
-ext/Time/HiRes/hints/irix.pl	Hint for Time::HiRes for named architecture
-ext/Time/HiRes/hints/linux.pl	Hints for Time::HiRes for named architecture
-ext/Time/HiRes/hints/sco.pl	Hints for Time::HiRes for named architecture
-ext/Time/HiRes/hints/solaris.pl	Hints for Time::HiRes for named architecture
-ext/Time/HiRes/hints/svr4.pl	Hints for Time::HiRes for named architecture
-ext/Time/HiRes/HiRes.pm		Time::HiRes extension
-ext/Time/HiRes/HiRes.xs		Time::HiRes extension
-ext/Time/HiRes/Makefile.PL	Time::HiRes extension
-ext/Time/HiRes/t/HiRes.t	Test for Time::HiRes
-ext/Time/HiRes/typemap		Time::HiRes extension
+ext/Time-HiRes/Changes		Time::HiRes extension
+ext/Time-HiRes/fallback/const-c.inc	Time::HiRes extension
+ext/Time-HiRes/fallback/const-xs.inc	Time::HiRes extension
+ext/Time-HiRes/hints/aix.pl	Hint for Time::HiRes for named architecture
+ext/Time-HiRes/hints/dec_osf.pl		Hint for Time::HiRes for named architecture
+ext/Time-HiRes/hints/dynixptx.pl	Hint for Time::HiRes for named architecture
+ext/Time-HiRes/hints/irix.pl	Hint for Time::HiRes for named architecture
+ext/Time-HiRes/hints/linux.pl	Hints for Time::HiRes for named architecture
+ext/Time-HiRes/hints/sco.pl	Hints for Time::HiRes for named architecture
+ext/Time-HiRes/hints/solaris.pl	Hints for Time::HiRes for named architecture
+ext/Time-HiRes/hints/svr4.pl	Hints for Time::HiRes for named architecture
+ext/Time-HiRes/HiRes.pm		Time::HiRes extension
+ext/Time-HiRes/HiRes.xs		Time::HiRes extension
+ext/Time-HiRes/Makefile.PL	Time::HiRes extension
+ext/Time-HiRes/t/HiRes.t	Test for Time::HiRes
+ext/Time-HiRes/typemap		Time::HiRes extension
 ext/Time/Piece/Changes		Time::Piece extension
 ext/Time/Piece/Makefile.PL	Time::Piece extension
 ext/Time/Piece/Piece.pm		Time::Piece extension
diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index bf12d5c740..42a5c458d2 100644
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1085,7 +1085,7 @@ package Maintainers;
 	'Time::HiRes' =>
 		{
 		'MAINTAINER'	=> 'zefram',
-		'FILES'		=> q[ext/Time/HiRes],
+		'FILES'		=> q[ext/Time-HiRes],
 		'CPAN'		=> 1,
 		'UPSTREAM'	=> undef,
 		},
diff --git a/README.cygwin b/README.cygwin
index b53e99af58..231d94721d 100644
--- a/README.cygwin
+++ b/README.cygwin
@@ -568,7 +568,7 @@ be kept as clean as possible.
   Porting/checkAUTHORS.pl
   ext/Compress-Raw-Zlib/Changes ext/Compress-Raw-Zlib/README
   ext/Compress-Zlib/Changes ext/Cwd/Changes ext/DB_File/Changes
-  ext/Encode/Changes ext/Sys/Syslog/Changes ext/Time/HiRes/Changes
+  ext/Encode/Changes ext/Sys/Syslog/Changes ext/Time-HiRes/Changes
   ext/Win32API-File/Changes lib/CGI/Changes lib/ExtUtils/CBuilder/Changes
   lib/ExtUtils/Changes lib/ExtUtils/NOTES lib/ExtUtils/PATCHING
   lib/ExtUtils/README lib/Module/Build/Changes lib/Net/Ping/Changes
@@ -645,9 +645,9 @@ be kept as clean as possible.
                         - Cygwin has syslog.h
   ext/Sys/Syslog/win32/compile.pl
                         - Convert paths to Windows paths
-  ext/Time/HiRes/HiRes.xs
+  ext/Time-HiRes/HiRes.xs
                         - Various timers not available
-  ext/Time/HiRes/Makefile.PL
+  ext/Time-HiRes/Makefile.PL
                         - Find w32api/windows.h
   ext/Win32/Makefile.PL - Use various libraries under Cygwin
   ext/Win32/Win32.xs    - Child dir and child env under Cygwin
@@ -663,7 +663,7 @@ be kept as clean as possible.
                         - Use binary mode under Cygwin
   ext/Sys/Syslog/win32/Win32.pm
                         - Convert paths to Windows paths
-  ext/Time/HiRes/HiRes.pm
+  ext/Time-HiRes/HiRes.pm
                         - Comment about various timers not available
   ext/Win32API-File/File.pm
                         - _open_osfhandle not implemented under Cygwin
@@ -727,7 +727,7 @@ be kept as clean as possible.
   ext/POSIX/t/time.t
   ext/SDBM_File/t/sdbm.t
   ext/Sys/Syslog/t/syslog.t
-  ext/Time/HiRes/t/HiRes.t
+  ext/Time-HiRes/t/HiRes.t
   ext/Win32/t/Unicode.t
   ext/Win32API-File/t/file.t
   ext/Win32CORE/t/win32core.t
diff --git a/ext/Time/HiRes/.gitignore b/ext/Time-HiRes/.gitignore
index a89cf3eadf..a89cf3eadf 100644
--- a/ext/Time/HiRes/.gitignore
+++ b/ext/Time-HiRes/.gitignore
diff --git a/ext/Time/HiRes/Changes b/ext/Time-HiRes/Changes
index ffec191c1e..ffec191c1e 100644
--- a/ext/Time/HiRes/Changes
+++ b/ext/Time-HiRes/Changes
diff --git a/ext/Time/HiRes/HiRes.pm b/ext/Time-HiRes/HiRes.pm
index da4d45a96e..da4d45a96e 100644
--- a/ext/Time/HiRes/HiRes.pm
+++ b/ext/Time-HiRes/HiRes.pm
diff --git a/ext/Time/HiRes/HiRes.xs b/ext/Time-HiRes/HiRes.xs
index 69eee69333..69eee69333 100644
--- a/ext/Time/HiRes/HiRes.xs
+++ b/ext/Time-HiRes/HiRes.xs
diff --git a/ext/Time/HiRes/Makefile.PL b/ext/Time-HiRes/Makefile.PL
index 2fe6cf4cf8..c44199835f 100644
--- a/ext/Time/HiRes/Makefile.PL
+++ b/ext/Time-HiRes/Makefile.PL
@@ -100,7 +100,7 @@ sub try_compile_and_link {
 
 	if ($ENV{PERL_CORE}) {
 	    my $updir = File::Spec->updir;
-	    $COREincdir = File::Spec->catdir(($updir) x 3);
+	    $COREincdir = File::Spec->catdir(($updir) x 2);
 	} else {
 	    $COREincdir = File::Spec->catdir($Config{'archlibexp'}, 'CORE');
 	}
diff --git a/ext/Time/HiRes/fallback/const-c.inc b/ext/Time-HiRes/fallback/const-c.inc
index a8626172af..a8626172af 100644
--- a/ext/Time/HiRes/fallback/const-c.inc
+++ b/ext/Time-HiRes/fallback/const-c.inc
diff --git a/ext/Time/HiRes/fallback/const-xs.inc b/ext/Time-HiRes/fallback/const-xs.inc
index c84dd051dd..c84dd051dd 100644
--- a/ext/Time/HiRes/fallback/const-xs.inc
+++ b/ext/Time-HiRes/fallback/const-xs.inc
diff --git a/ext/Time/HiRes/hints/aix.pl b/ext/Time-HiRes/hints/aix.pl
index bbb7fa8342..bbb7fa8342 100644
--- a/ext/Time/HiRes/hints/aix.pl
+++ b/ext/Time-HiRes/hints/aix.pl
diff --git a/ext/Time/HiRes/hints/dec_osf.pl b/ext/Time-HiRes/hints/dec_osf.pl
index b19d149e70..b19d149e70 100644
--- a/ext/Time/HiRes/hints/dec_osf.pl
+++ b/ext/Time-HiRes/hints/dec_osf.pl
diff --git a/ext/Time/HiRes/hints/dynixptx.pl b/ext/Time-HiRes/hints/dynixptx.pl
index 0a1e5db38f..0a1e5db38f 100644
--- a/ext/Time/HiRes/hints/dynixptx.pl
+++ b/ext/Time-HiRes/hints/dynixptx.pl
diff --git a/ext/Time/HiRes/hints/irix.pl b/ext/Time-HiRes/hints/irix.pl
index 83d98bcab6..83d98bcab6 100644
--- a/ext/Time/HiRes/hints/irix.pl
+++ b/ext/Time-HiRes/hints/irix.pl
diff --git a/ext/Time/HiRes/hints/linux.pl b/ext/Time-HiRes/hints/linux.pl
index 84ce5221b1..84ce5221b1 100644
--- a/ext/Time/HiRes/hints/linux.pl
+++ b/ext/Time-HiRes/hints/linux.pl
diff --git a/ext/Time/HiRes/hints/sco.pl b/ext/Time-HiRes/hints/sco.pl
index 22f2764347..22f2764347 100644
--- a/ext/Time/HiRes/hints/sco.pl
+++ b/ext/Time-HiRes/hints/sco.pl
diff --git a/ext/Time/HiRes/hints/solaris.pl b/ext/Time-HiRes/hints/solaris.pl
index 6cc80e7bc5..6cc80e7bc5 100644
--- a/ext/Time/HiRes/hints/solaris.pl
+++ b/ext/Time-HiRes/hints/solaris.pl
diff --git a/ext/Time/HiRes/hints/svr4.pl b/ext/Time-HiRes/hints/svr4.pl
index 75128724f2..75128724f2 100644
--- a/ext/Time/HiRes/hints/svr4.pl
+++ b/ext/Time-HiRes/hints/svr4.pl
diff --git a/ext/Time/HiRes/t/HiRes.t b/ext/Time-HiRes/t/HiRes.t
index 373c328d0a..373c328d0a 100644
--- a/ext/Time/HiRes/t/HiRes.t
+++ b/ext/Time-HiRes/t/HiRes.t
diff --git a/ext/Time/HiRes/typemap b/ext/Time-HiRes/typemap
index 1124eb6483..1124eb6483 100644
--- a/ext/Time/HiRes/typemap
+++ b/ext/Time-HiRes/typemap
diff --git a/mkppport.lst b/mkppport.lst
index bc5d412c13..e16ffb4989 100644
--- a/mkppport.lst
+++ b/mkppport.lst
@@ -6,6 +6,6 @@
 #
 
 ext/IPC-SysV
-ext/Time/HiRes
+ext/Time-HiRes
 ext/Win32API-File
 ext/DB_File
diff --git a/util.c b/util.c
index 521a8c2419..ea84cdadab 100644
--- a/util.c
+++ b/util.c
@@ -5568,7 +5568,7 @@ S_mem_log_common(enum mem_log_type mlt, const UV n, const UV typesize, const cha
         (void)time(&when);
 #   endif
 	/* If there are other OS specific ways of hires time than
-	 * gettimeofday() (see ext/Time/HiRes), the easiest way is
+	 * gettimeofday() (see ext/Time-HiRes), the easiest way is
 	 * probably that they would be used to fill in the struct
 	 * timeval. */
 # endif