Change adaptor for Adaptor, and fix misplaced adaptor for Driver in driver.