fix optvals naming