Consistent namespacing