Fix more fallout from namespace change.
Update README.