Update README and some naming