5 files changed, 7 insertions, 7 deletions
diff --git a/java/com/tigervnc/vncviewer/MANIFEST.MF b/java/com/tigervnc/vncviewer/MANIFEST.MF
index 9e282655..5f67f81c 100644
--- a/java/com/tigervnc/vncviewer/MANIFEST.MF
+++ b/java/com/tigervnc/vncviewer/MANIFEST.MF
@@ -1,5 +1,5 @@
 Manifest-Version: 1.0
 Main-Class: com.tigervnc.vncviewer.VncViewer
-Application-Name: TigerVNC viewer
+Application-Name: TigerVNC
 Permissions: all-permissions
 Codebase: *
diff --git a/java/com/tigervnc/vncviewer/OptionsDialog.java b/java/com/tigervnc/vncviewer/OptionsDialog.java
index ccf27327..9c442cbc 100644
--- a/java/com/tigervnc/vncviewer/OptionsDialog.java
+++ b/java/com/tigervnc/vncviewer/OptionsDialog.java
@@ -177,7 +177,7 @@ class OptionsDialog extends Dialog {
   @SuppressWarnings({"rawtypes","unchecked"})
   public OptionsDialog() {
     super(true);
-    setTitle("VNC viewer options");
+    setTitle("TigerVNC options");
     setResizable(false);
 
     getContentPane().setLayout(
diff --git a/java/com/tigervnc/vncviewer/ServerDialog.java b/java/com/tigervnc/vncviewer/ServerDialog.java
index 01f91db2..9c92698e 100644
--- a/java/com/tigervnc/vncviewer/ServerDialog.java
+++ b/java/com/tigervnc/vncviewer/ServerDialog.java
@@ -47,7 +47,7 @@ class ServerDialog extends Dialog implements Runnable {
     super(true);
     this.vncServerName = vncServerName;
     setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-    setTitle("VNC viewer: Connection details");
+    setTitle("TigerVNC");
     setResizable(false);
     addWindowListener(new WindowAdapter() {
       public void windowClosing(WindowEvent e) {
@@ -258,7 +258,7 @@ class ServerDialog extends Dialog implements Runnable {
       JOptionPane op =
         new JOptionPane(msg, JOptionPane.QUESTION_MESSAGE,
                         JOptionPane.OK_CANCEL_OPTION, null, options, options[1]);
-      JDialog dlg = op.createDialog(this, "TigerVNC Viewer");
+      JDialog dlg = op.createDialog(this, "TigerVNC");
       dlg.setIconImage(VncViewer.frameIcon);
       dlg.setAlwaysOnTop(true);
       dlg.setVisible(true);
diff --git a/java/com/tigervnc/vncviewer/Viewport.java b/java/com/tigervnc/vncviewer/Viewport.java
index 0f614162..3c6f623e 100644
--- a/java/com/tigervnc/vncviewer/Viewport.java
+++ b/java/com/tigervnc/vncviewer/Viewport.java
@@ -647,7 +647,7 @@ class Viewport extends JPanel implements ActionListener {
              this, ID.OPTIONS, EnumSet.noneOf(MENU.class));
     menu_add(contextMenu, "Connection info...", KeyEvent.VK_I,
              this, ID.INFO, EnumSet.noneOf(MENU.class));
-    menu_add(contextMenu, "About TigerVNC viewer...", KeyEvent.VK_T,
+    menu_add(contextMenu, "About TigerVNC...", KeyEvent.VK_T,
              this, ID.ABOUT, EnumSet.of(MENU.DIVIDER));
 
     menu_add(contextMenu, "Dismiss menu", KeyEvent.VK_M,
diff --git a/java/com/tigervnc/vncviewer/VncViewer.java b/java/com/tigervnc/vncviewer/VncViewer.java
index ea2c2125..2a372b98 100644
--- a/java/com/tigervnc/vncviewer/VncViewer.java
+++ b/java/com/tigervnc/vncviewer/VncViewer.java
@@ -361,7 +361,7 @@ public class VncViewer implements Runnable {
     JOptionPane op =
       new JOptionPane(msg, JOptionPane.INFORMATION_MESSAGE,
                       JOptionPane.DEFAULT_OPTION, VncViewer.logoIcon, options);
-    JDialog dlg = op.createDialog(parent, "About TigerVNC viewer for Java");
+    JDialog dlg = op.createDialog(parent, "About TigerVNC");
     dlg.setIconImage(VncViewer.frameIcon);
     dlg.setAlwaysOnTop(true);
     dlg.setVisible(true);
@@ -380,7 +380,7 @@ public class VncViewer implements Runnable {
   void reportException(java.lang.Exception e) {
     String title, msg = e.getMessage();
     int msgType = JOptionPane.ERROR_MESSAGE;
-    title = "TigerVNC viewer : Error";
+    title = "TigerVNC : Error";
     e.printStackTrace();
     JOptionPane.showMessageDialog(null, msg, title, msgType);
   }