changing namespace names to be more java friendly