Updated some namespace names.