Update and rename NAMESPACE1 to NAMESPACE