Renamed few public toplevel variables for consistency