clean up json keys and fix all things that use them