Map names better reflect Map nature.
Java doc
improved readability for collecting metrics