Revert "Renamed generateOptionTag"

This reverts commit 356c228795b5e3147c4d6d60c4ed3705ce21ac2e.