removed Opt suffix from value's name
added support for ut/it.