Fix variable rename