GH-5 Renamed some variables