Use the new naming konventions for keys.