CE-1018 Fix namespace issues