Fixed some namespace names