Refactoring of name bits to compactTarget accross the whole codebase