Adjusting the namespacing of the data