Merge pull request #3458 from vlakoff/documentation

Update reserved controller names