Reverted namespace change