Fix renamed variables