diff --git a/java/src/com/tightvnc/vncviewer/ClipboardFrame.java b/java/src/com/tightvnc/vncviewer/ClipboardFrame.java
index f6e7f41..2b11eb8 100644
--- a/java/src/com/tightvnc/vncviewer/ClipboardFrame.java
+++ b/java/src/com/tightvnc/vncviewer/ClipboardFrame.java
@@ -40,7 +40,7 @@
   //
 
   ClipboardFrame(VncViewer v) {
-    super("TightVNC Clipboard");
+    super("TigerVNC Clipboard");
 
     viewer = v;
 
diff --git a/java/src/com/tightvnc/vncviewer/OptionsFrame.java b/java/src/com/tightvnc/vncviewer/OptionsFrame.java
index 5034af6..e1125f4 100644
--- a/java/src/com/tightvnc/vncviewer/OptionsFrame.java
+++ b/java/src/com/tightvnc/vncviewer/OptionsFrame.java
@@ -113,7 +113,7 @@
   //
 
   OptionsFrame(VncViewer v) {
-    super("TightVNC Options");
+    super("TigerVNC Options");
 
     viewer = v;
 
diff --git a/java/src/com/tightvnc/vncviewer/README b/java/src/com/tightvnc/vncviewer/README
index 0e455b0..18fd7db 100644
--- a/java/src/com/tightvnc/vncviewer/README
+++ b/java/src/com/tightvnc/vncviewer/README
@@ -1,5 +1,5 @@
 
-  TightVNC Java Viewer version 1.3.9
+  TigerVNC Java Viewer version 1.3.9
 
 ======================================================================
 
@@ -17,7 +17,7 @@
 
 This software is distributed under the GNU General Public Licence as
 published by the Free Software Foundation. See the file LICENCE.TXT for the
-conditions under which this software is made available. TightVNC also
+conditions under which this software is made available. TigerVNC also
 contains code from other sources. See the Acknowledgements section below, and
 the individual files for details of the conditions under which they are made
 available.
@@ -38,15 +38,15 @@
 Installation
 ============
 
-There are three basic ways to use TightVNC Java viewer:
+There are three basic ways to use TigerVNC Java viewer:
 
-  1. Running applet as part of TightVNC server installation.
+  1. Running applet as part of TigerVNC server installation.
 
-     Both the Unix and Windows versions of TightVNC servers include small
+     Both the Unix and Windows versions of TigerVNC servers include small
      built-in HTTP server which can serve Java viewer to Web clients. This
      enables easy Web access to the shared desktop without need to install
      any software on the client computer. Unix and Windows versions of
-     TightVNC servers are different in the way they store the .class and .jar
+     TigerVNC servers are different in the way they store the .class and .jar
      files: the Unix server (Xvnc) is able to serve any set of files present
      in a particular directory, while the Windows server (WinVNC) has all the
      .class and .jar files inside the WinVNC executable file. Therefore, for
@@ -70,7 +70,7 @@
      fully-functional HTTP server such as Apache or IIS. Obviously, this
      method requires running an HTTP server, and due to the Java security
      restrictions, it's also required that the server should be installed on
-     the same machine which is running the TightVNC server. In this case,
+     the same machine which is running the TigerVNC server. In this case,
      installation is simply copying the .class and .jar files into a
      directory that is under control of the HTTP server. Also, an HTML page
      should be created which will act as a the base document for the viewer
@@ -98,7 +98,7 @@
 Parameters
 ==========
 
-TightVNC Java viewer supports a number of parameters allowing you to
+TigerVNC Java viewer supports a number of parameters allowing you to
 customize its behavior. Most parameters directly correspond to the settings
 found in the Options window. However, there are parameters that do not
 correspond to those settings. For such parameters, you can see a note "no GUI
@@ -126,7 +126,7 @@
 Both parameter names and their values are case-insensitive. The only
 exception is the "PASSWORD" parameter, as VNC passwords are case-sensitive.
 
-Here is the complete list of parameters supported in TightVNC Java viewer:
+Here is the complete list of parameters supported in TigerVNC Java viewer:
 
 --> "HOST" (no GUI equivalent)
 
@@ -182,7 +182,7 @@
     that are appropriate for current connection speed. "Hextile" is an
     encoding that was designed for fast networks, while "Tight" is better
     suited for low-bandwidth connections. From the other side, "Tight"
-    decoder in the TightVNC Java viewer seems to be more efficient than
+    decoder in the TigerVNC Java viewer seems to be more efficient than
     "Hextile" decoder so it may be ok for fast networks too. "ZRLE" encoding
     is similar to "Tight", but it does not support JPEG compression and
     compression levels. Unlike "Tight" encoding, "ZRLE" is supported in
@@ -407,12 +407,12 @@
 RECORDING VNC SESSIONS
 ======================
 
-Current version of the TightVNC Java viewer is able to record VNC (RFB)
+Current version of the TigerVNC Java viewer is able to record VNC (RFB)
 sessions in files for later playback. The data format in saved session files
 is compatible with the rfbproxy program written by Tim Waugh. Most important
 thing about session recording is that it's supported only if Java security
 manager allows access to local filesystem. Typically, it would not work for
-unsigned applets. To use this feature, either use TightVNC Java viewer as a
+unsigned applets. To use this feature, either use TigerVNC Java viewer as a
 standalone application (Java Runtime Environment or Java Development Kit
 should be installed), or as a signed applet. The code checks if it's possible
 to support session recording, and if everything's fine, the new "Record"
diff --git a/java/src/com/tightvnc/vncviewer/RecordingFrame.java b/java/src/com/tightvnc/vncviewer/RecordingFrame.java
index 6d9ea11..f2e1fae 100644
--- a/java/src/com/tightvnc/vncviewer/RecordingFrame.java
+++ b/java/src/com/tightvnc/vncviewer/RecordingFrame.java
@@ -67,7 +67,7 @@
   //
 
   RecordingFrame(VncViewer v) {
-    super("TightVNC Session Recording");
+    super("TigerVNC Session Recording");
 
     viewer = v;
 
diff --git a/java/src/com/tightvnc/vncviewer/VncViewer.java b/java/src/com/tightvnc/vncviewer/VncViewer.java
index fd71114..bdaee68 100644
--- a/java/src/com/tightvnc/vncviewer/VncViewer.java
+++ b/java/src/com/tightvnc/vncviewer/VncViewer.java
@@ -105,7 +105,7 @@
     refApplet = this;
 
     if (inSeparateFrame) {
-      vncFrame = new Frame("TightVNC");
+      vncFrame = new Frame("TigerVNC");
       if (!inAnApplet) {
 	vncFrame.add("Center", this);
       }
diff --git a/java/src/com/tightvnc/vncviewer/index.html b/java/src/com/tightvnc/vncviewer/index.html
index 1ebf0c2..96805dc 100644
--- a/java/src/com/tightvnc/vncviewer/index.html
+++ b/java/src/com/tightvnc/vncviewer/index.html
@@ -1,7 +1,7 @@
 <!-- 
-     index.html - an example HTML page for TightVNC Java viewer applet, to be
+     index.html - an example HTML page for TigerVNC Java viewer applet, to be
      used with a standalone Web server running on the same machine where the
-     TightVNC server is running. Before using this example, please MAKE SURE
+     TigerVNC server is running. Before using this example, please MAKE SURE
      to check the following:
 
      * the value of the PORT parameter should be set correctly (normally, the
@@ -18,12 +18,12 @@
 
 <HTML>
 <TITLE>
-TightVNC desktop
+TigerVNC desktop
 </TITLE>
 <APPLET CODE="VncViewer.class" ARCHIVE="VncViewer.jar"
         WIDTH="800" HEIGHT="632">
 <PARAM NAME="PORT" VALUE="5901">
 </APPLET>
 <BR>
-<A href="http://www.tightvnc.com/">TightVNC site</A>
+<A href="http://www.tigervnc.org/">TigerVNC site</A>
 </HTML>
diff --git a/java/src/com/tightvnc/vncviewer/index.vnc b/java/src/com/tightvnc/vncviewer/index.vnc
index a987bf5..f24df7c 100644
--- a/java/src/com/tightvnc/vncviewer/index.vnc
+++ b/java/src/com/tightvnc/vncviewer/index.vnc
@@ -1,5 +1,5 @@
 <!-- 
-     index.vnc - default HTML page for TightVNC Java viewer applet, to be
+     index.vnc - default HTML page for TigerVNC Java viewer applet, to be
      used with Xvnc. On any file ending in .vnc, the HTTP server embedded in
      Xvnc will substitute the following variables when preceded by a dollar:
      USER, DESKTOP, DISPLAY, APPLETWIDTH, APPLETHEIGHT, WIDTH, HEIGHT, PORT,
@@ -7,7 +7,7 @@
      HTML page.
 
      NOTE: the $PARAMS variable is not supported by the standard VNC, so
-     make sure you have TightVNC on the server side, if you're using this
+     make sure you have TigerVNC on the server side, if you're using this
      variable.
 -->
 
@@ -21,5 +21,5 @@
 $PARAMS
 </APPLET>
 <BR>
-<A href="http://www.tightvnc.com/">TightVNC site</A>
+<A href="http://www.tigervnc.org/">TigerVNC site</A>
 </HTML>