[CHORE][!!!] Upgrading class names to use namespaces.

THIS COULD BREAK YOUR STUFF.

It won't though, if when using cicbase 6.x you were updating the legacy classnames (in cicbase) as you were using them.