Incorporate modified namespacing.