Merge PR #4761, GUI class name renaming

Merge PR #4761, GUI class name renaming