Fixed naming errors.
Nameing changes
Several changes.

+ Long standing bug was fixed. It was related to namespaces and not erasure.