LPS-43171  move namespace out of escapeing