Yet another namespace fix