update comments, struct names