Rename keys to where, fix readme.