Resolve conflict for Concrete5

While integrating DokuWiki with Concrete5 (auth plugin), some
classes/classnames conflict. These changes resolve the issue.

Ultimately all classes should be namespaced to resolve classname
conflicts.