Update and rename Comment to Comments