Fixed renamed variables issues