diff --git a/src/fix_shake.h b/src/fix_shake.h
index fcd2a93f38..328e0280ac 100644
--- a/src/fix_shake.h
+++ b/src/fix_shake.h
@@ -84,7 +84,6 @@ class FixShake : public Fix {
   double **xshake;                       // unconstrained atom coords
   int *nshake;                           // count
 
-  int vflag;                            // virial flag
   double dtv,dtfsq;                     // timesteps for trial move
   double dtf_inner,dtf_innerhalf;       // timesteps for rRESPA trial move
 
diff --git a/src/fix_wall.cpp b/src/fix_wall.cpp
index c5915db2dd..9cac82b859 100644
--- a/src/fix_wall.cpp
+++ b/src/fix_wall.cpp
@@ -182,13 +182,13 @@ FixWall::FixWall(LAMMPS *lmp, int narg, char **arg) :
   }
 
   // set xflag if any wall positions are variable
-  // set vflag if any wall positions or parameters are variable
+  // set varflag if any wall positions or parameters are variable
   // set wstyle to VARIABLE if either epsilon or sigma is a variable
 
-  vflag = xflag = 0;
+  varflag = xflag = 0;
   for (int m = 0; m < nwall; m++) {
     if (xstyle[m] == VARIABLE) xflag = 1;
-    if (xflag || estyle[m] == VARIABLE || sstyle[m] == VARIABLE) vflag = 1;
+    if (xflag || estyle[m] == VARIABLE || sstyle[m] == VARIABLE) varflag = 1;
     if (estyle[m] == VARIABLE || sstyle[m] == VARIABLE) wstyle[m] = VARIABLE;
     else wstyle[m] = CONSTANT;
   }
@@ -303,7 +303,7 @@ void FixWall::post_force(int vflag)
   // evaluate variables if necessary, wrap with clear/add
   // for epsilon/sigma variables need to re-invoke precompute()
 
-  if (vflag) modify->clearstep_compute();
+  if (varflag) modify->clearstep_compute();
 
   double coord;
   for (int m = 0; m < nwall; m++) {
@@ -330,7 +330,7 @@ void FixWall::post_force(int vflag)
     wall_particle(m,wallwhich[m],coord);
   }
 
-  if (vflag) modify->addstep_compute(update->ntimestep + 1);
+  if (varflag) modify->addstep_compute(update->ntimestep + 1);
 }
 
 /* ---------------------------------------------------------------------- */
diff --git a/src/fix_wall.h b/src/fix_wall.h
index 2def697522..2eced3a007 100644
--- a/src/fix_wall.h
+++ b/src/fix_wall.h
@@ -51,7 +51,7 @@ class FixWall : public Fix {
   int estyle[6],sstyle[6],wstyle[6];
   int eindex[6],sindex[6];
   char *estr[6],*sstr[6];
-  int vflag;                  // 1 if any wall position,epsilon,sigma is a var
+  int varflag;                // 1 if any wall position,epsilon,sigma is a var
   int eflag;                  // per-wall flag for energy summation
   int nlevels_respa;
   double dt;