diff --git a/ChangeLog b/ChangeLog
index 3cc059e10..b02b2a2d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-05-01  Robert Larice
+ * src/spicelib/analysis/analysis.c ,
+ * src/spicelib/analysis/analysis.h ,
+ * src/spicelib/analysis/cktdojob.c ,
+ * src/spicelib/analysis/ckttroub.c :
+    rename struct member public  -->  if_analysis
+
 2011-05-01  Robert Larice
  * src/frontend/help/x11disp.c :
     rename function delete  -->  delete_w
diff --git a/src/spicelib/analysis/analysis.c b/src/spicelib/analysis/analysis.c
index cbe88ac2f..c73786552 100644
--- a/src/spicelib/analysis/analysis.c
+++ b/src/spicelib/analysis/analysis.c
@@ -35,12 +35,12 @@ SPICEanalysis *analInfo[] = {
 
 char *spice_analysis_get_name(int index)
 {
-    return analInfo[index]->public.name;
+    return analInfo[index]->if_analysis.name;
 }
 
 char *spice_analysis_get_description(int index)
 {
-    return analInfo[index]->public.description;
+    return analInfo[index]->if_analysis.description;
 }
 
 int spice_num_analysis(void)
diff --git a/src/spicelib/analysis/analysis.h b/src/spicelib/analysis/analysis.h
index 8f9b1fe5d..14235c19a 100644
--- a/src/spicelib/analysis/analysis.h
+++ b/src/spicelib/analysis/analysis.h
@@ -2,7 +2,7 @@
 #define _ANALYSIS_H
 
 struct SPICEanalysis {
-    IFanalysis public;
+    IFanalysis if_analysis;
     int size;
     int domain;
     int do_ic;
diff --git a/src/spicelib/analysis/cktdojob.c b/src/spicelib/analysis/cktdojob.c
index 95cfa2bf5..c59d55926 100644
--- a/src/spicelib/analysis/cktdojob.c
+++ b/src/spicelib/analysis/cktdojob.c
@@ -40,7 +40,7 @@ CKTdoJob(CKTcircuit *inCkt, int reset, TSKtask *inTask)
     /* Sensitivity is special */
     if (sens_num < 0) {
 	for (i = 0; i <  ANALmaxnum; i++)
-	    if (!strcmp("SENS2", analInfo[i]->public.name))
+	    if (!strcmp("SENS2", analInfo[i]->if_analysis.name))
 		break;
 	sens_num = i;
     }
diff --git a/src/spicelib/analysis/ckttroub.c b/src/spicelib/analysis/ckttroub.c
index e47bced48..dbf600af4 100644
--- a/src/spicelib/analysis/ckttroub.c
+++ b/src/spicelib/analysis/ckttroub.c
@@ -33,9 +33,9 @@ CKTtrouble(CKTcircuit *cktp, char *optmsg)
     an = analInfo[ckt->CKTcurJob->JOBtype];
 
     if (optmsg && *optmsg) {
-       sprintf(msg_buf, "%s:  %s; ", an->public.name, optmsg);
+       sprintf(msg_buf, "%s:  %s; ", an->if_analysis.name, optmsg);
     } else {
-       sprintf(msg_buf, "%s:  ", an->public.name);
+       sprintf(msg_buf, "%s:  ", an->if_analysis.name);
     }
 
     msg_p = msg_buf + strlen(msg_buf);