Making the names consistent with what's in Moore, and checking that the example DaVinci options work.