Doc System, change hardcoded labels
Merge pull request #1401 from julceslauhub/master

DocSystem, change hardcoded labels