CBI-7 - Changed to capital letters 'CTI' in namespace service definitions