Updates to namespace names as discussed with isam on IRC. Yes, I know 'Template'...