More renaming and improvements in the README.