Decreased Name Length

For #1815 - decreasing length to prevent OF