Remove legacy code and simplify stubbing

Splitting the class name to get the outer-most namespace/class appears
to be a throw-back to when sub-types (e.g. Speeches) were namespaced
below their parent class.