Added underscores and nolowercase options