In "Iterable" and in all its subclasses, "itera...

In "Iterable" and in all its subclasses, "iterator" replaces "elements"
(and assorted changes).

28 files changed, 74 insertions, 53 deletions

diff --git a/src/library/scala/collection/mutable/ArrayBuffer.scala b/src/library/scala/collection/mutable/ArrayBuffer.scala
index ae17cc33b4..d25c55f4af 100644
--- a/src/library/scala/collection/mutable/ArrayBuffer.scala
+++ b/src/library/scala/collection/mutable/ArrayBuffer.scala
@@ -58,7 +58,7 @@ class ArrayBuffer[A](override protected val initialSize: Int)
   }
 
   /** Appends a number of elements provided by an iterable object
-   *  via its <code>elements</code> method. The identity of the
+   *  via its <code>iterator</code> method. The identity of the
    *  buffer is returned.
    *
    *  @param iter  the iterfable object.
@@ -91,7 +91,7 @@ class ArrayBuffer[A](override protected val initialSize: Int)
   }
 
   /** Prepends a number of elements provided by an iterable object
-   *  via its <code>elements</code> method. The identity of the
+   *  via its <code>iterator</code> method. The identity of the
    *  buffer is returned.
    *
    *  @param iter  the iterable object.
@@ -148,7 +148,7 @@ class ArrayBuffer[A](override protected val initialSize: Int)
    *
    *  @return an <code>ArrayBuffer</code> with the same elements.
    */
-  override def clone(): ArrayBuffer[A] = new ArrayBuffer[A] ++ this
+  override def clone(): ArrayBuffer[A] = new ArrayBuffer[A] ++= this
 
   def result: ArrayBuffer[A] = this
 
diff --git a/src/library/scala/collection/mutable/ArrayStack.scala b/src/library/scala/collection/mutable/ArrayStack.scala
index 8461191ff8..cae18452f3 100644
--- a/src/library/scala/collection/mutable/ArrayStack.scala
+++ b/src/library/scala/collection/mutable/ArrayStack.scala
@@ -153,7 +153,7 @@ class ArrayStack[T] private(private var table : Array[AnyRef],
   /**
    * Iterates over the stack in fifo order.
    */
-  def elements = new Iterator[T]{
+  def iterator: Iterator[T] = new Iterator[T]{
     var currentIndex = index;
     def hasNext = currentIndex > 0;
     def next = {
@@ -162,6 +162,8 @@ class ArrayStack[T] private(private var table : Array[AnyRef],
     }
   }
 
+  @deprecated def elements = iterator
+
   override def foreach[U](f : T =>  U){
     var currentIndex = index;
     while(currentIndex > 0){
diff --git a/src/library/scala/collection/mutable/BufferProxy.scala b/src/library/scala/collection/mutable/BufferProxy.scala
index f430cae83d..b45e151da9 100644
--- a/src/library/scala/collection/mutable/BufferProxy.scala
+++ b/src/library/scala/collection/mutable/BufferProxy.scala
@@ -27,7 +27,7 @@ trait BufferProxy[A] extends Buffer[A] with Proxy {
 
   def length: Int = self.length
 
-  override def elements: Iterator[A] = self.elements
+  override def iterator: Iterator[A] = self.iterator
 
   def apply(n: Int): A = self.apply(n)
 
@@ -48,7 +48,7 @@ trait BufferProxy[A] extends Buffer[A] with Proxy {
   override def readOnly = self.readOnly
 
   /** Appends a number of elements provided by an iterable object
-   *  via its <code>elements</code> method. The identity of the
+   *  via its <code>iterator</code> method. The identity of the
    *  buffer is returned.
    *
    *  @param iter  the iterable object.
@@ -57,7 +57,7 @@ trait BufferProxy[A] extends Buffer[A] with Proxy {
   override def ++(iter: Iterable[A]): Buffer[A] = self.++(iter)
 
   /** Appends a number of elements provided by an iterable object
-   *  via its <code>elements</code> method.
+   *  via its <code>iterator</code> method.
    *
    *  @param iter  the iterable object.
    */
@@ -70,7 +70,7 @@ trait BufferProxy[A] extends Buffer[A] with Proxy {
   override def append(elems: A*): Unit = self.++=(elems)
 
   /** Appends a number of elements provided by an iterable object
-   *  via its <code>elements</code> method.
+   *  via its <code>iterator</code> method.
    *
    *  @param iter  the iterable object.
    */
@@ -84,7 +84,7 @@ trait BufferProxy[A] extends Buffer[A] with Proxy {
   def +:(elem: A): Buffer[A] = self.+:(elem)
 
   /** Prepends a number of elements provided by an iterable object
-   *  via its <code>elements</code> method. The identity of the
+   *  via its <code>iterator</code> method. The identity of the
    *  buffer is returned.
    *
    *  @param iter  the iterable object.
@@ -98,7 +98,7 @@ trait BufferProxy[A] extends Buffer[A] with Proxy {
   override def prepend(elems: A*): Unit = self.prependAll(elems)
 
   /** Prepends a number of elements provided by an iterable object
-   *  via its <code>elements</code> method. The identity of the
+   *  via its <code>iterator</code> method. The identity of the
    *  buffer is returned.
    *
    *  @param iter  the iterable object.
diff --git a/src/library/scala/collection/mutable/DefaultMapModel.scala b/src/library/scala/collection/mutable/DefaultMapModel.scala
index 9acf089506..f76a54c739 100644
--- a/src/library/scala/collection/mutable/DefaultMapModel.scala
+++ b/src/library/scala/collection/mutable/DefaultMapModel.scala
@@ -40,6 +40,7 @@ trait DefaultMapModel[A, B] extends Map[A, B] {
 
   def += (kv: (A, B)): this.type = { put(kv._1, kv._2); this }
 
-  def elements = entries map {e => (e.key, e.value)}
+  def iterator = entries map {e => (e.key, e.value)}
+
 }
 
diff --git a/src/library/scala/collection/mutable/FlatHashTable.scala b/src/library/scala/collection/mutable/FlatHashTable.scala
index dd09af381e..de926e8108 100644
--- a/src/library/scala/collection/mutable/FlatHashTable.scala
+++ b/src/library/scala/collection/mutable/FlatHashTable.scala
@@ -113,7 +113,7 @@ trait FlatHashTable[A] {
     None
   }
 
-  def elements = new Iterator[A] {
+  def iterator = new Iterator[A] {
     private var i = 0
     def hasNext: Boolean = {
       while (i < table.length && (null == table(i))) i += 1
@@ -124,6 +124,8 @@ trait FlatHashTable[A] {
       else Iterator.empty.next
   }
 
+  @deprecated def elements = iterator
+
   private def growTable() {
     val oldtable = table
     table = new Array[AnyRef](table.length * 2)
diff --git a/src/library/scala/collection/mutable/HashMap.scala b/src/library/scala/collection/mutable/HashMap.scala
index f8ba594d4c..255358ae1f 100644
--- a/src/library/scala/collection/mutable/HashMap.scala
+++ b/src/library/scala/collection/mutable/HashMap.scala
@@ -54,7 +54,7 @@ class HashMap[A, B] extends Map[A, B]
 
   def -=(key: A): this.type = { removeEntry(key); this }
 
-  def elements = entries map {e => (e.key, e.value)}
+  def iterator = entriesIterator map {e => (e.key, e.value)}
 }
 
 /** This class implements mutable maps using a hashtable.
diff --git a/src/library/scala/collection/mutable/HashSet.scala b/src/library/scala/collection/mutable/HashSet.scala
index d5eba30552..20e5a1e6b5 100644
--- a/src/library/scala/collection/mutable/HashSet.scala
+++ b/src/library/scala/collection/mutable/HashSet.scala
@@ -48,7 +48,7 @@ class HashSet[A] extends Set[A]
     }
   }
 
-  override def clone(): HashSet[A] = new HashSet[A] ++ this
+  override def clone(): HashSet[A] = new HashSet[A] ++= this
 }
 
 /** Factory object for `HashSet` class */
diff --git a/src/library/scala/collection/mutable/HashTable.scala b/src/library/scala/collection/mutable/HashTable.scala
index ada2df83b3..be0a84bd41 100644
--- a/src/library/scala/collection/mutable/HashTable.scala
+++ b/src/library/scala/collection/mutable/HashTable.scala
@@ -111,7 +111,7 @@ trait HashTable[A] extends AnyRef {
 
   /** An iterator returning all entries
    */
-  protected def entries: Iterator[Entry] = new Iterator[Entry] {
+  protected def entriesIterator: Iterator[Entry] = new Iterator[Entry] {
     val iterTable = table
     var idx = table.length - 1
     var es = iterTable(idx).asInstanceOf[Entry]
@@ -131,6 +131,11 @@ trait HashTable[A] extends AnyRef {
     }
   }
 
+  /** An iterator returning all entries
+   *  @deprecated use entriesIterator instead
+   */
+  @deprecated protected def entries: Iterator[Entry] = entriesIterator
+
   /** Remove all entries from table
    */
   def clear() {
diff --git a/src/library/scala/collection/mutable/History.scala b/src/library/scala/collection/mutable/History.scala
index 6f2ab4b160..25fe640c2a 100644
--- a/src/library/scala/collection/mutable/History.scala
+++ b/src/library/scala/collection/mutable/History.scala
@@ -38,8 +38,8 @@ class History[A, B] extends AnyRef with Subscriber[A, B] with Collection[(B, A)]
   }
 
   override def size: Int = log.length
-  def elements: Iterator[(B, A)] = log.elements
-  def events: Iterator[A] = log.elements.map { case (_, e) => e }
+  def iterator: Iterator[(B, A)] = log.iterator
+  def events: Iterator[A] = log.iterator.map { case (_, e) => e }
 
   def clear(): Unit = log.clear
 }
diff --git a/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala b/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
index 12c8140d8a..86d8facfc4 100644
--- a/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
+++ b/src/library/scala/collection/mutable/ImmutableMapAdaptor.scala
@@ -40,13 +40,17 @@ extends Map[A, B]
 
   override def isDefinedAt(key: A) = imap.isDefinedAt(key)
 
-  override def keys: Iterator[A] = imap.keys
+  override def keys: collection.Set[A] = imap.keys
 
-  override def keySet: collection.Set[A] = imap.keySet
+  override def keysIterator: Iterator[A] = imap.keysIterator
 
-  override def values: Iterator[B] = imap.values
+  override def values: collection.Set[A] = imap.values
 
-  def elements: Iterator[(A, B)] = imap.elements
+  override def valuesIterator: Iterator[B] = imap.valuesIterator
+
+  def iterator: Iterator[(A, B)] = imap.iterator
+
+  @deprecated def elements = iterator
 
   override def toList: List[(A, B)] = imap.toList
 
diff --git a/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala b/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala
index af25841f84..bac4f95246 100644
--- a/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala
+++ b/src/library/scala/collection/mutable/ImmutableSetAdaptor.scala
@@ -39,7 +39,9 @@ class ImmutableSetAdaptor[A](protected var set: immutable.Set[A]) extends Set[A]
 
   override def toString = set.toString
 
-  def elements: Iterator[A] = set.elements
+  def iterator: Iterator[A] = set.iterator
+
+  @deprecated override def elements: Iterator[A] = iterator
 
   def +=(elem: A): this.type = { set = set + elem; this }
 
diff --git a/src/library/scala/collection/mutable/LinkedHashMap.scala b/src/library/scala/collection/mutable/LinkedHashMap.scala
index 29e77fb01c..c43a3ee2f4 100644
--- a/src/library/scala/collection/mutable/LinkedHashMap.scala
+++ b/src/library/scala/collection/mutable/LinkedHashMap.scala
@@ -75,7 +75,7 @@ class LinkedHashMap[A, B] extends Map[A, B]
   def += (kv: (A, B)): this.type = { put(kv._1, kv._2); this }
   def -=(key: A): this.type = { remove(key); this }
 
-  def elements: Iterator[(A, B)] = new Iterator[(A, B)] {
+  def iterator: Iterator[(A, B)] = new Iterator[(A, B)] {
     private var cur = firstEntry
     def hasNext = cur ne null
     def next =
@@ -83,7 +83,7 @@ class LinkedHashMap[A, B] extends Map[A, B]
       else Iterator.empty.next
   }
 
-  override def keys: Iterator[A] = new Iterator[A] {
+  override def keysIterator: Iterator[A] = new Iterator[A] {
     private var cur = firstEntry
     def hasNext = cur ne null
     def next =
@@ -91,7 +91,7 @@ class LinkedHashMap[A, B] extends Map[A, B]
       else Iterator.empty.next
   }
 
-  override def values: Iterator[B] = new Iterator[B] {
+  override def valuesIterator: Iterator[B] = new Iterator[B] {
     private var cur = firstEntry
     def hasNext = cur ne null
     def next = { val res = cur.value; cur = cur.later; res }
diff --git a/src/library/scala/collection/mutable/LinkedHashSet.scala b/src/library/scala/collection/mutable/LinkedHashSet.scala
index 14f6b18722..f2825db975 100644
--- a/src/library/scala/collection/mutable/LinkedHashSet.scala
+++ b/src/library/scala/collection/mutable/LinkedHashSet.scala
@@ -47,7 +47,7 @@ class LinkedHashSet[A] extends Set[A]
     super.clear()
   }
 
-  override def elements = ordered.elements
+  override def iterator = ordered.iterator
 
   override def foreach[U](f: A => U) = ordered foreach f
 }
diff --git a/src/library/scala/collection/mutable/ListBuffer.scala b/src/library/scala/collection/mutable/ListBuffer.scala
index a83f620699..c75e18dcd1 100644
--- a/src/library/scala/collection/mutable/ListBuffer.scala
+++ b/src/library/scala/collection/mutable/ListBuffer.scala
@@ -277,7 +277,7 @@ final class ListBuffer[A]
     this
   }
 
-  override def elements = new Iterator[A] {
+  override def iterator = new Iterator[A] {
     var cursor: List[A] = null
     def hasNext: Boolean = !start.isEmpty && cursor != last0
     def next(): A =
@@ -309,7 +309,7 @@ final class ListBuffer[A]
    *
    *  @return a <code>ListBuffer</code> with the same elements.
    */
-  override def clone(): ListBuffer[A] = (new ListBuffer[A]) ++ this
+  override def clone(): ListBuffer[A] = (new ListBuffer[A]) ++= this
 
   /** Defines the prefix of the string representation.
    *
diff --git a/src/library/scala/collection/mutable/ListMap.scala b/src/library/scala/collection/mutable/ListMap.scala
index 8b8e5d87a6..a0d844cb5d 100644
--- a/src/library/scala/collection/mutable/ListMap.scala
+++ b/src/library/scala/collection/mutable/ListMap.scala
@@ -23,7 +23,7 @@ class ListMap[A, B] extends Map[A, B] with MutableMapTemplate[A, B, ListMap[A, B
   private var siz: Int = 0
 
   def get(key: A): Option[B] = elems find (_._1 == key) map (_._2)
-  def elements: Iterator[(A, B)] = elems.elements
+  def iterator: Iterator[(A, B)] = elems.iterator
   def += (kv: (A, B)) = { elems = remove(kv._1, elems); elems = kv :: elems; siz += 1; this }
   def -= (key: A) = { elems = remove(key, elems); this }
 
diff --git a/src/library/scala/collection/mutable/Map.scala b/src/library/scala/collection/mutable/Map.scala
index 94e376cd67..eab5b426a8 100644
--- a/src/library/scala/collection/mutable/Map.scala
+++ b/src/library/scala/collection/mutable/Map.scala
@@ -26,7 +26,7 @@ trait Map[A, B]
     override def size = self.size
     override def update(key: A, value: B) = self.update(key, value)
     override def - (elem: A) = self - elem
-    override def elements = self.elements
+    override def iterator = self.iterator
     override def foreach[U](f: ((A, B)) =>  U) = self.foreach(f)
     override def empty[C] = self.empty[C]
     def get(key: A) = self.get(key)
diff --git a/src/library/scala/collection/mutable/MutableList.scala b/src/library/scala/collection/mutable/MutableList.scala
index 605d511f05..a2a283f2c4 100644
--- a/src/library/scala/collection/mutable/MutableList.scala
+++ b/src/library/scala/collection/mutable/MutableList.scala
@@ -92,8 +92,8 @@ class MutableList[A] extends LinearSequence[A] with LinearSequenceTemplate[A, Mu
 
   /** Returns an iterator over all elements of this list.
    */
-  override def elements: Iterator[A] =
-    if (first0 eq null) Iterator.empty else first0.elements
+  override def iterator: Iterator[A] =
+    if (first0 eq null) Iterator.empty else first0.iterator
 
   override def last = last0.elem
 
diff --git a/src/library/scala/collection/mutable/OpenHashMap.scala b/src/library/scala/collection/mutable/OpenHashMap.scala
index 5a0810cfe4..8373b4fdde 100644
--- a/src/library/scala/collection/mutable/OpenHashMap.scala
+++ b/src/library/scala/collection/mutable/OpenHashMap.scala
@@ -165,7 +165,7 @@ class OpenHashMap[Key, Value](initialSize : Int) extends scala.collection.mutabl
    * An iterator over the elements of this map. Use of this iterator follows the same
    * contract for concurrent modification as the foreach method.
    */
-  def elements = new Iterator[(Key, Value)]{
+  def iterator = new Iterator[(Key, Value)]{
     var index = 0;
     val initialModCount = modCount;
 
@@ -184,6 +184,9 @@ class OpenHashMap[Key, Value](initialSize : Int) extends scala.collection.mutabl
     }
   }
 
+  /** @deprecated use `iterator` instead */
+  @deprecated override def elements: Iterator[(Key, Value)] = iterator
+
   override def clone : OpenHashMap[Key, Value] = {
     val it = new OpenHashMap[Key, Value]
     foreachUndeletedEntry(entry => it.put(entry.key, entry.hash, entry.value.get));
diff --git a/src/library/scala/collection/mutable/PriorityQueue.scala b/src/library/scala/collection/mutable/PriorityQueue.scala
index d013497389..1665c38dac 100644
--- a/src/library/scala/collection/mutable/PriorityQueue.scala
+++ b/src/library/scala/collection/mutable/PriorityQueue.scala
@@ -88,7 +88,7 @@ class PriorityQueue[A <% Ordered[A]] extends ResizableArray[A] with CloneableCol
    *
    *  @param  iter        an iterable object
    */
-  def ++=(iter: Iterable[A]): Unit = this ++= iter.elements
+  def ++=(iter: Iterable[A]): Unit = this ++= iter.iterator
 
   /** Adds all elements provided by an iterator into the priority queue.
    *
@@ -138,7 +138,7 @@ class PriorityQueue[A <% Ordered[A]] extends ResizableArray[A] with CloneableCol
    *
    *  @return  an iterator over all elements sorted in descending order.
    */
-  override def elements: Iterator[A] = new Iterator[A] {
+  override def iterator: Iterator[A] = new Iterator[A] {
     val as: Array[AnyRef] = new Array[AnyRef](size0)
     Array.copy(array, 0, as, 0, size0)
     var i = size0 - 1
@@ -158,7 +158,7 @@ class PriorityQueue[A <% Ordered[A]] extends ResizableArray[A] with CloneableCol
    */
   override def equals(obj: Any): Boolean = obj match {
     case that: PriorityQueue[_] =>
-      (this.elements zip that.elements) forall {
+      (this.iterator zip that.iterator) forall {
         case (thiselem, thatelem) => thiselem == thatelem
       }
     case _ =>
diff --git a/src/library/scala/collection/mutable/PriorityQueueProxy.scala b/src/library/scala/collection/mutable/PriorityQueueProxy.scala
index 7eab4df05e..de909fa470 100644
--- a/src/library/scala/collection/mutable/PriorityQueueProxy.scala
+++ b/src/library/scala/collection/mutable/PriorityQueueProxy.scala
@@ -31,7 +31,7 @@ abstract class PriorityQueueProxy[A <% Ordered[A]] extends PriorityQueue[A]
    *
    *  @return the new iterator
    */
-  override def elements: Iterator[A] = self.elements
+  override def iterator: Iterator[A] = self.iterator
 
   /** Returns the length of this priority queue.
    */
diff --git a/src/library/scala/collection/mutable/QueueProxy.scala b/src/library/scala/collection/mutable/QueueProxy.scala
index cfe364108a..cd3ca80c5e 100644
--- a/src/library/scala/collection/mutable/QueueProxy.scala
+++ b/src/library/scala/collection/mutable/QueueProxy.scala
@@ -90,7 +90,7 @@ trait QueueProxy[A] extends Queue[A] with SeqProxy[A] {
    *
    *  @return an iterator over all queue elements.
    */
-  override def elements: Iterator[A] = self.elements
+  override def iteratoor: Iterator[A] = self.iterator
 
   /** This method clones the queue.
    *
diff --git a/src/library/scala/collection/mutable/Set.scala b/src/library/scala/collection/mutable/Set.scala
index 8118f8a58f..d17dee1753 100644
--- a/src/library/scala/collection/mutable/Set.scala
+++ b/src/library/scala/collection/mutable/Set.scala
@@ -17,7 +17,7 @@ import generic._
  *  have to provide functionality for the abstract methods in Set:
  *
  *  def contains(elem: A): Boolean
- *  def elements: Iterator[A]
+ *  def iterator: Iterator[A]
  *  def += (elem: A): this.type
  *  def -= (elem: A): this.type
  *
diff --git a/src/library/scala/collection/mutable/Stack.scala b/src/library/scala/collection/mutable/Stack.scala
index b63a07dbb1..b079a94f92 100644
--- a/src/library/scala/collection/mutable/Stack.scala
+++ b/src/library/scala/collection/mutable/Stack.scala
@@ -111,7 +111,7 @@ class Stack[A] private (var elems: List[A]) extends collection.Sequence[A] with
    *
    *  @return an iterator over all stack elements.
    */
-  override def elements: Iterator[A] = elems.elements
+  override def iterator: Iterator[A] = elems.iterator
 
   /** Creates a list of all stack elements in LIFO order.
    *
diff --git a/src/library/scala/collection/mutable/StackProxy.scala b/src/library/scala/collection/mutable/StackProxy.scala
index 1833af0f33..cb7f180849 100644
--- a/src/library/scala/collection/mutable/StackProxy.scala
+++ b/src/library/scala/collection/mutable/StackProxy.scala
@@ -94,7 +94,7 @@ trait StackProxy[A] extends Stack[A] with SeqProxy[A] {
    *
    *  @return an iterator over all stack elements.
    */
-  override def elements: Iterator[A] = self.elements
+  override def iterator: Iterator[A] = self.iterator
 
   /** Creates a list of all stack elements in FIFO order.
    *
diff --git a/src/library/scala/collection/mutable/SynchronizedBuffer.scala b/src/library/scala/collection/mutable/SynchronizedBuffer.scala
index 4209dff391..58c8d749bb 100644
--- a/src/library/scala/collection/mutable/SynchronizedBuffer.scala
+++ b/src/library/scala/collection/mutable/SynchronizedBuffer.scala
@@ -26,8 +26,8 @@ trait SynchronizedBuffer[A] extends Buffer[A] {
     super.length
   }
 
-  abstract override def elements: Iterator[A] = synchronized {
-    super.elements
+  abstract override def iterator: Iterator[A] = synchronized {
+    super.iterator
   }
 
   abstract override def apply(n: Int): A = synchronized {
@@ -52,7 +52,7 @@ trait SynchronizedBuffer[A] extends Buffer[A] {
   }
 
   /** Appends a number of elements provided by an iterable object
-   *  via its <code>elements</code> method. The identity of the
+   *  via its <code>iterator</code> method. The identity of the
    *  buffer is returned.
    *
    *  @param iter  the iterable object.
@@ -62,7 +62,7 @@ trait SynchronizedBuffer[A] extends Buffer[A] {
   }
 
   /** Appends a number of elements provided by an iterable object
-   *  via its <code>elements</code> method.
+   *  via its <code>iterator</code> method.
    *
    *  @param iter  the iterable object.
    */
@@ -79,7 +79,7 @@ trait SynchronizedBuffer[A] extends Buffer[A] {
   }
 
   /** Appends a number of elements provided by an iterable object
-   *  via its <code>elements</code> method.
+   *  via its <code>iterator</code> method.
    *
    *  @param iter  the iterable object.
    */
@@ -97,7 +97,7 @@ trait SynchronizedBuffer[A] extends Buffer[A] {
   }
 
   /** Prepends a number of elements provided by an iterable object
-   *  via its <code>elements</code> method. The identity of the
+   *  via its <code>iterator</code> method. The identity of the
    *  buffer is returned.
    *
    *  @param iter  the iterable object.
@@ -115,7 +115,7 @@ trait SynchronizedBuffer[A] extends Buffer[A] {
   }
 
   /** Prepends a number of elements provided by an iterable object
-   *  via its <code>elements</code> method. The identity of the
+   *  via its <code>iterator</code> method. The identity of the
    *  buffer is returned.
    *
    *  @param iter  the iterable object.
diff --git a/src/library/scala/collection/mutable/SynchronizedMap.scala b/src/library/scala/collection/mutable/SynchronizedMap.scala
index 4b30ce5d4b..61c9b50568 100644
--- a/src/library/scala/collection/mutable/SynchronizedMap.scala
+++ b/src/library/scala/collection/mutable/SynchronizedMap.scala
@@ -21,7 +21,7 @@ package scala.collection.mutable
 trait SynchronizedMap[A, B] extends Map[A, B] {
 
   abstract override def get(key: A): Option[B] = synchronized { super.get(key) }
-  abstract override def elements: Iterator[(A, B)] = synchronized { super.elements }
+  abstract override def iterator: Iterator[(A, B)] = synchronized { super.iterator }
   abstract override def += (kv: (A, B)): this.type = synchronized[this.type] { super.+=(kv) }
   abstract override def -= (key: A): this.type = synchronized[this.type] { super.-=(key) }
 
@@ -33,11 +33,13 @@ trait SynchronizedMap[A, B] extends Map[A, B] {
   override def getOrElseUpdate(key: A, default: => B): B = synchronized { super.getOrElseUpdate(key, default) }
   override def transform(f: (A, B) => B): this.type = synchronized[this.type] { super.transform(f) }
   override def retain(p: (A, B) => Boolean): this.type = synchronized[this.type] { super.retain(p) }
-  override def valueSet = synchronized { super.valueSet }
+  override def values: collection.immutable.Set[B] = synchronized { super.values }
+  override def valuesIterator: Iterator[B] = synchronized { super.valuesIterator }
   override def clone() = synchronized { super.clone() }
   override def foreach[U](f: ((A, B)) => U) = synchronized { super.foreach(f) }
   override def apply(key: A): B = synchronized { super.apply(key) }
-  override def keys: Iterator[A] = synchronized { super.keys }
+  override def keys: collection.Set[A] = synchronized { super.keys }
+  override def keysIterator: Iterator[A] = synchronized { super.keysIterator }
   override def isEmpty: Boolean = synchronized { super.isEmpty }
   override def contains(key: A): Boolean = synchronized {super.contains(key) }
   override def isDefinedAt(key: A) = synchronized { super.isDefinedAt(key) }
diff --git a/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala b/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala
index f500b46aa0..65cb592f0b 100644
--- a/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala
+++ b/src/library/scala/collection/mutable/SynchronizedPriorityQueue.scala
@@ -77,7 +77,7 @@ class SynchronizedPriorityQueue[A <% Ordered[A]] extends PriorityQueue[A] {
    *
    *  @return  an iterator over all elements sorted in descending order.
    */
-  override def elements: Iterator[A] = synchronized { super.elements }
+  override def iterator: Iterator[A] = synchronized { super.iterator }
 
   /** Checks if two queues are structurally identical.
    *
diff --git a/src/library/scala/collection/mutable/SynchronizedStack.scala b/src/library/scala/collection/mutable/SynchronizedStack.scala
index 4c0f63cd76..740449ffe7 100644
--- a/src/library/scala/collection/mutable/SynchronizedStack.scala
+++ b/src/library/scala/collection/mutable/SynchronizedStack.scala
@@ -84,7 +84,7 @@ class SynchronizedStack[A] extends Stack[A] {
    *
    *  @return an iterator over all stack elements.
    */
-  override def elements: Iterator[A] = synchronized { super.elements }
+  override def iterator: Iterator[A] = synchronized { super.iterator }
 
   /** Creates a list of all stack elements in FIFO order.
    *