update names per discussion at google/cayley#38