Fix some ns declarations after version namespace change.