diff --git a/ChangeLog b/ChangeLog
index be2e36a58..3a7b8843c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-17  Robert Larice
+ * src/frontend/variable.c ,
+ * src/frontend/variable.h ,
+ * src/frontend/vectors.c ,
+ * src/frontend/plotting/graf.c :
+    replace vt_types -> cp_types
+      to complete the last change, lets rename the enum itself as well
+      replacement was done mechanical, with
+        perl -pi -e 's/vt_types/cp_types/g' $(git grep -le '\bvt_types' | grep -v ChangeLog)
+ * src/include/cpextern.h :
+    fix a comment, reflecting the VT_ -> CP_ change
+
 2010-07-17  Robert Larice
  * src/* :
     textual replacement VT_* to CP_*
diff --git a/src/frontend/plotting/graf.c b/src/frontend/plotting/graf.c
index 1679dba8d..f7b576603 100644
--- a/src/frontend/plotting/graf.c
+++ b/src/frontend/plotting/graf.c
@@ -11,7 +11,7 @@ $Id$
  */
 
 #include <ngspice.h>
-#include "cpdefs.h"		/* for VT_ */
+#include "cpdefs.h"		/* for CP_ */
 #include "cpextern.h"
 #include <plot.h>
 #include "ftedebug.h"		/* for iplot */
diff --git a/src/frontend/variable.c b/src/frontend/variable.c
index 9d74356f0..00810957d 100644
--- a/src/frontend/variable.c
+++ b/src/frontend/variable.c
@@ -85,7 +85,7 @@ cp_varwl(struct variable *var)
 
 /* Set a variable. */
 void
-cp_vset(char *varname, enum vt_types type, char *value)
+cp_vset(char *varname, enum cp_types type, char *value)
 {
     struct variable *v, *u, *w;
     int i;
@@ -540,7 +540,7 @@ cp_remvar(char *varname)
 /* Determine the value of a variable.  Fail if the variable is unset,
  * and if the type doesn't match, try and make it work...  */
 bool
-cp_getvar(char *name, enum vt_types type, void *retval)
+cp_getvar(char *name, enum cp_types type, void *retval)
 {
     struct variable *v;
     struct variable *uv1, *uv2;
diff --git a/src/frontend/variable.h b/src/frontend/variable.h
index 90241bba3..a47775d78 100644
--- a/src/frontend/variable.h
+++ b/src/frontend/variable.h
@@ -12,7 +12,7 @@
  * expansions.  If the type is CP_LIST the value is a pointer to a
  * list of the elements.  */
 struct variable {
-    enum vt_types va_type;
+    enum cp_types va_type;
     char *va_name;
     union {
         bool vV_bool;
@@ -45,10 +45,10 @@ extern bool cp_echo;
 
 /* extern struct variable *variables; */
 wordlist * cp_varwl(struct variable *var);
-void cp_vset(char *varname, enum vt_types type, char *value);
+void cp_vset(char *varname, enum cp_types type, char *value);
 struct variable * cp_setparse(wordlist *wl);
 void cp_remvar(char *varname);
-bool cp_getvar(char *name, enum vt_types type, void *retval);
+bool cp_getvar(char *name, enum cp_types type, void *retval);
 wordlist * cp_variablesubst(wordlist *wlist);
 wordlist * vareval(char *string);
 void cp_vprint(void);
diff --git a/src/frontend/vectors.c b/src/frontend/vectors.c
index 95b9304cd..d6de335d5 100644
--- a/src/frontend/vectors.c
+++ b/src/frontend/vectors.c
@@ -444,7 +444,7 @@ vec_get(const char *vec_name)
     *#define va_real  va_V.vV_real
     *#define va_string   va_V.vV_string
     *#define va_vlist     va_V.vV_list
-    *enum vt_types {
+    *enum cp_types {
     *  CP_BOOL,
     *  CP_NUM,
     *  CP_REAL,
diff --git a/src/include/cpextern.h b/src/include/cpextern.h
index b27074ec9..a40c53d2a 100644
--- a/src/include/cpextern.h
+++ b/src/include/cpextern.h
@@ -160,7 +160,7 @@ void cp_rehash(char *pathlist, bool docc);
 
 /* variable.c */
 
-enum vt_types {
+enum cp_types {
   CP_BOOL,
   CP_NUM,
   CP_REAL,
@@ -174,7 +174,7 @@ extern bool cp_noglob;
 extern bool cp_nonomatch;
 extern char cp_dol;
 extern void cp_remvar(char *varname);
-extern void cp_vset(char *varname, enum vt_types type, char *value);
+extern void cp_vset(char *varname, enum cp_types type, char *value);
 extern struct variable *cp_setparse(wordlist *wl);
 extern wordlist *vareval(char *string);
 
@@ -185,7 +185,7 @@ extern void com_option(wordlist *wl);
 extern void com_state(wordlist *wl);
 extern void com_unset(wordlist *wl);
 extern void com_shift(wordlist *wl);
-extern bool cp_getvar(char *name, enum vt_types type, void *retval);
+extern bool cp_getvar(char *name, enum cp_types type, void *retval);
 
 /* cpinterface.c etc -- stuff CP needs from FTE */