diff --git a/core/lib/Foswiki/Contrib/core/MANIFEST b/core/lib/Foswiki/Contrib/core/MANIFEST
index 68011a95ae..eb49c84b2e 100644
--- a/core/lib/Foswiki/Contrib/core/MANIFEST
+++ b/core/lib/Foswiki/Contrib/core/MANIFEST
@@ -153,11 +153,10 @@ data/System/TwentyMinuteTutorial.txt 0644
 data/System/MetaData.txt 0644
 data/System/ShortcutMacros.txt 0644
 data/System/CommandAndCGIScripts.txt 0644
-data/System/TWikiSite.txt 0644
 data/System/SiteTools.txt 0644
-data/System/TWikiSystemRequirements.txt 0644
-data/System/TWikiTopics.txt 0644
-data/System/TWikiUserAuthentication.txt 0644
+data/System/SystemRequirements.txt 0644
+data/System/TopicsAndWebs.txt 0644
+data/System/UserAuthentication.txt 0644
 data/System/TemplateWeb.txt 0644
 data/System/TextEditor.txt 0644
 data/System/TextFormattingFAQ.txt 0644
diff --git a/core/locale/TWiki.pot b/core/locale/Foswiki.pot
similarity index 100%
rename from core/locale/TWiki.pot
rename to core/locale/Foswiki.pot
diff --git a/core/tools/xgettext b/core/tools/xgettext
index 5cd0eecc87..9792107730 100755
--- a/core/tools/xgettext
+++ b/core/tools/xgettext
@@ -1,18 +1,18 @@
 #!/usr/bin/perl
 #
-# Script to extract strings from TWiki sources and templates
+# Script to extract strings from Foswiki sources and templates
 
 use strict;
 
 # force the use from the root
--d 'bin' and -d "lib" and -d 'tools' and -d 'templates' or die("You may only run this utility from the root directory of TWiki sources!");
+-d 'bin' and -d "lib" and -d 'tools' and -d 'templates' or die("You may only run this utility from the root directory of Foswiki sources!");
 
 use File::Spec;
 
 my $cwd = `pwd` ;
 chomp($cwd);
 unshift(@INC, File::Spec->catfile($cwd, 'lib')); 
-eval "use TWiki::I18N::Extract";
+eval "use Foswiki::I18N::Extract";
 die($@) if $@;
 eval "use Locale::Maketext::Lexicon";
 die($@) if $@;
@@ -24,7 +24,7 @@ die('The msgmerge command is required, it must be in your path. Try installing G
 
 # config
 my $localesDir = "locale";
-my $potfile = "${localesDir}/TWiki.pot";
+my $potfile = "${localesDir}/Foswiki.pot";
 my $newpotfile = $potfile . '.new';
 
 # extract strings from the source code and append to the new potfile
@@ -71,7 +71,7 @@ sub extract {
     my ($target, @sources) = @_;
     print "I: Extracting strings into $target.\n";
 
-    my $extractor = new TWiki::I18N::Extract;
+    my $extractor = new Foswiki::I18N::Extract;
     die("Could not create an extractor. Is Locale::Maketext installed? (see above messages)") unless $extractor;
 
     my $progress = undef;