changed composite namespace logic