Update variable names for backwards compatibility