diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index f4214e34db..911164bb47 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -2,6 +2,8 @@
 
 	* ui/QCitationDialogBase.ui: Omit correct signal for styleCO changes
 	(bug 1284).
+	* QNote.C:
+	* ui/QNoteDialogBase.ui: consistent terminology for note inset (bug 1270)
 
 2003-07-29  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
diff --git a/src/frontends/qt2/QNote.C b/src/frontends/qt2/QNote.C
index 5fba9fa456..691c353575 100644
--- a/src/frontends/qt2/QNote.C
+++ b/src/frontends/qt2/QNote.C
@@ -26,7 +26,7 @@ typedef QController<ControlNote, QView<QNoteDialog> > base_class;
 
 
 QNote::QNote(Dialog & parent)
-	: base_class(parent, _("LyX: Annotation Settings"))
+	: base_class(parent, _("LyX: Note Settings"))
 {}
 
 
diff --git a/src/frontends/qt2/ui/QNoteDialogBase.ui b/src/frontends/qt2/ui/QNoteDialogBase.ui
index fc9df7470d..b86b3c51dc 100644
--- a/src/frontends/qt2/ui/QNoteDialogBase.ui
+++ b/src/frontends/qt2/ui/QNoteDialogBase.ui
@@ -19,7 +19,7 @@
     </property>
     <property stdset="1">
         <name>caption</name>
-        <string>Annotation Settings</string>
+        <string>Note Settings</string>
     </property>
     <property stdset="1">
         <name>sizeGripEnabled</name>
@@ -91,7 +91,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;Note</string>
+                        <string>LyX &amp;Note</string>
                     </property>
                     <property>
                         <name>toolTip</name>
@@ -110,7 +110,7 @@
                     </property>
                     <property>
                         <name>toolTip</name>
-                        <string>Export to LaTeX but don't print</string>
+                        <string>Export to LaTeX/Docbook but don't print</string>
                     </property>
                 </widget>
                 <widget>