clean up renaming (Id -> ID)

With the latest commit #5 you renamed some ...Id to ...ID. A few comments (and one interface) were missing.