Updated option generation naming.