diff --git a/CHANGES.html b/CHANGES.html
index c4998225f..a6f56d1d8 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -95,6 +95,12 @@ that all derived classes need to implement in order to integrate properly with t
 </li>
 <li> The Ns2CalendarScheduler event scheduler has been removed.
 </li>
+<li>
+ErrorUnit enum has been moved into RateErrorModel class, and symbols EU_BIT, EU_BYTE and EU_PKT have been renamed to RateErrorModel::ERROR_UNIT_BIT, RateErrorModel::ERROR_UNIT_BYTE and RateErrorModel::ERROR_UNIT_PACKET. RateErrorModel class attribute "ErrorUnit" values have also been renamed for consistency, and are now "ERROR_UNIT_BIT", "ERROR_UNIT_BYTE", "ERROR_UNIT_PACKET".
+</li>
+<li>
+QueueMode enum from DropTailQueue and RedQueue classes has been unified and moved to Queueu class. Symbols DropTailQueue::PACKETS and DropTailQueue::BYTES are now named Queue::QUEUE_MODE_PACKETS and DropTailQueue::QUEUE_MODE_BYTES. In addition, DropTailQueue and RedQueue class attributes "Mode" have been renamed for consistency from "Packets" and "Bytes" to "QUEUE_MODE_PACKETS" and "QUEUE_MODE_BYTES".
+</li>
 </ul>
 
 <h2>Changes to build system:</h2>
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index a3314a1be..08b2faeab 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -32,8 +32,11 @@ New user-visible features
   i.e., enable/disable the ICMPv6 Redirect sending.
 - An antenna module is now included, which includes different
   radiation pattern models. See the corresponding new section of the
-  ns-3 models library documentation for details. 
-   
+  ns-3 models library documentation for details.
+- Longer and more descriptive names are used for error units in RateErrorModel
+  class and queue mode in Queue class. Attributs in those classes are also
+  changed for consistency. See API documentation for details.
+
 Bugs fixed
 ----------
  - bug 962  - list of paths to reach objects contains bogus entries