Remove extra underscore from generated director names to maintain prevent breaking languages that do not support nspace.