Cbi-9 - Fixed namespace usage and service definitions