DRY applied to class names

Closes-bug: #1237747

We had some classes that contained part of the namespace in its name.
This makes classes names unnecessarily verbose.

Change-Id: I1a5c5be290437b6087cb57c63d9ea10826667f19
Merge "DRY applied to class names"