rename columns in comments and annotations for consistency