Address comments, mostly naming