Continuing namespace changes, cvs frontend.