Now compiles, and have renamed Name -> Id to make it obvious, nearly to the point of running tests again