naming update
removed deprecated option
naming fix