Change of module name to be consistent with common header namespacing