Issue 1494 - Use the upper class just in case
Issue 1495 - Option group names from waf 1.7