Key changes

@etpinard, we never resolved the issue of depreciated keys. this is the PR to do that.