Fix toc names
Merge branch 'GG-fix-toc-names' into dev