update README and a few name changes 2