Use consistent namespacing