Update naming-conventions.md
Merge pull request #1720 from yuj/patch-1

Update naming-conventions.md