Renaming key to keyh and fixes for deprecations