update readme and some naming