diff --git a/ChangeLog b/ChangeLog
index 2c500e07d..414302139 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-07-16  Robert Larice
+ * src/ngsconvert.c ,
+ * src/frontend/define.c ,
+ * src/frontend/define.h ,
+ * src/frontend/vectors.c ,
+ * src/frontend/vectors.h ,
+ * src/include/fteext.h :
+
 2010-07-16  Robert Larice
  * src/xspice/icm/xtraevt/d_to_real/cfunc.mod ,
  * src/xspice/icm/xtraevt/real_delay/cfunc.mod ,
diff --git a/src/frontend/define.c b/src/frontend/define.c
index cd226decc..fa9094b3c 100644
--- a/src/frontend/define.c
+++ b/src/frontend/define.c
@@ -262,7 +262,7 @@ prtree1(struct pnode *pn, FILE *fp)
 }
 
 struct pnode *
-ft_substdef(char *name, struct pnode *args)
+ft_substdef(const char *name, struct pnode *args)
 {
     struct udfunc *udf;
     struct pnode *tp;
diff --git a/src/frontend/define.h b/src/frontend/define.h
index bb8b826b8..c9890333f 100644
--- a/src/frontend/define.h
+++ b/src/frontend/define.h
@@ -7,7 +7,7 @@
 #define DEFINE_H_INCLUDED
 
 void com_define(wordlist *wlist);
-struct pnode * ft_substdef(char *name, struct pnode *args);
+struct pnode * ft_substdef(const char *name, struct pnode *args);
 void com_undefine(wordlist *wlist);
 
 
diff --git a/src/frontend/vectors.c b/src/frontend/vectors.c
index 84141b84f..8ca9bf1ec 100644
--- a/src/frontend/vectors.c
+++ b/src/frontend/vectors.c
@@ -303,15 +303,15 @@ vec_fromplot(char *word, struct plot *plot)
 #define SPECCHAR '@'
 
 struct dvec *
-vec_get(char *word)
+vec_get(const char *vec_name)
 {
     struct dvec *d, *end = NULL, *newv = NULL;
     struct plot *pl;
-    char buf[BSIZE_SP], *s, *wd, *whole, *name = NULL, *param;
+    char buf[BSIZE_SP], *s, *wd, *word, *whole, *name = NULL, *param;
     int i = 0;
     struct variable *vv;
 
-    wd = word = copy(word);     /* Gets mangled below... */
+    wd = word = copy(vec_name);   /* Gets mangled below... */
 
     if (index(word, '.')) {
         /* Snag the plot... */
diff --git a/src/frontend/vectors.h b/src/frontend/vectors.h
index e0dfbf14d..55ac5d7b7 100644
--- a/src/frontend/vectors.h
+++ b/src/frontend/vectors.h
@@ -11,7 +11,7 @@ void ft_loadfile(char *file);
 void plot_add(struct plot *pl);
 void vec_remove(char *name);
 struct dvec * vec_fromplot(char *word, struct plot *plot);
-struct dvec * vec_get(char *word);
+struct dvec * vec_get(const char *word);
 void plot_docoms(wordlist *wl);
 struct dvec * vec_copy(struct dvec *v);
 struct plot * plot_alloc(char *name);
diff --git a/src/include/fteext.h b/src/include/fteext.h
index 44b1b89dd..0762226e3 100644
--- a/src/include/fteext.h
+++ b/src/include/fteext.h
@@ -150,7 +150,7 @@ extern void com_state(wordlist *wl);
 
 /* define.c */
 
-extern struct pnode *ft_substdef(char *name, struct pnode *args);
+extern struct pnode *ft_substdef(const char *name, struct pnode *args);
 extern void com_define(wordlist *wl);
 extern void com_undefine(wordlist *wl);
 extern void ft_pnode(struct pnode *pn);
@@ -459,7 +459,7 @@ extern bool vec_eq(struct dvec *v1, struct dvec *v2);
 extern int plot_num;
 extern struct dvec *vec_fromplot(char *word, struct plot *plot);
 extern struct dvec *vec_copy(struct dvec *v);
-extern struct dvec *vec_get(char *word);
+extern struct dvec *vec_get(const char *word);
 extern struct dvec *vec_mkfamily(struct dvec *v);
 extern struct plot *plot_cur;
 extern struct plot *plot_alloc(char *name);
diff --git a/src/ngsconvert.c b/src/ngsconvert.c
index 92235a72e..0c86db8b0 100644
--- a/src/ngsconvert.c
+++ b/src/ngsconvert.c
@@ -446,7 +446,7 @@ void out_printf(char *fmt, ...) { }
 #endif
 void out_send(char *string) {}
 struct variable * cp_enqvar(char *word) { return (NULL); }
-struct dvec *vec_get(char *word) { return (NULL); }
+struct dvec *vec_get(const char *word) { return (NULL); }
 void cp_ccom(wordlist *w, char *b, bool e) { return; }
 int cp_usrset(struct variable *v, bool i) { return(US_OK); }