tweaking the names and docs