Removed 'CS' or 'CJ' from all files and replaced with 'CB'
Few more naming changes.