Fix Variables Names