Reverting the namespace changes