Updating comments and names