Fixed variable rename