Adjusting namespace names