Reverted the namespace change to avoid conflicts and backward incompatibilities