Update use of common functions
Update option naming