Corrected some name inconsistencies in guide/toolkit.
Merge with repo.