renamed some metrics to match new key scheme
added migration for new key format