Update options naming