Adjust data storage keys