Rename things, fix embarassing spelling error.