Rename CName to Id

Also begin to implement the Collector interface.