WIP: resolve option naming issue