Revert "max name length increased to 15"

This reverts commit 169cc5668e4142367995e5095068d065c6890d5f.