fix #224 - part 2 - renaming stuff
- per Eli code review suggestion, renaming sections to be more generic