Remove naming oddity, call opts options everywhere