[CHORE][!!!] Updating templates to use new cicbase namepaces.

THIS COULD BREAK YOUR STUFF

Most of the time, these templates are overridden so you're probably fine.