Change option type names from ___Opt to Opt___