Fix opt naming