Rename also inner functions variables for consistency