fix keys, and variable names