diff --git a/vhdlpp/expression.cc b/vhdlpp/expression.cc
index d52fa4d11..9efe60931 100644
--- a/vhdlpp/expression.cc
+++ b/vhdlpp/expression.cc
@@ -875,8 +875,8 @@ double ExpTime::to_fs() const
     return val;
 }
 
-ExpRange::ExpRange(Expression*left, Expression*right, range_dir_t direction)
-: left_(left), right_(right), direction_(direction), range_expr_(false),
+ExpRange::ExpRange(Expression*left_idx, Expression*right_idx, range_dir_t dir)
+: left_(left_idx), right_(right_idx), direction_(dir), range_expr_(false),
     range_base_(NULL)
 {
 }
diff --git a/vhdlpp/expression.h b/vhdlpp/expression.h
index b1b6ae244..65e1934bd 100644
--- a/vhdlpp/expression.h
+++ b/vhdlpp/expression.h
@@ -1020,7 +1020,7 @@ class ExpRange : public Expression {
         typedef enum { DOWNTO, TO, AUTO } range_dir_t;
 
         // Regular range
-        ExpRange(Expression*left, Expression*right, range_dir_t direction);
+        ExpRange(Expression*left_idx, Expression*right_idx, range_dir_t dir);
         // 'range/'reverse range attribute
         ExpRange(ExpName*base, bool reverse_range);
         ~ExpRange();
diff --git a/vhdlpp/sequential.cc b/vhdlpp/sequential.cc
index 3e572fce0..9f83c1372 100644
--- a/vhdlpp/sequential.cc
+++ b/vhdlpp/sequential.cc
@@ -304,7 +304,7 @@ WaitForStmt::WaitForStmt(Expression*delay)
 {
 }
 
-WaitStmt::WaitStmt(wait_type_t type, Expression*expr)
-: type_(type), expr_(expr)
+WaitStmt::WaitStmt(wait_type_t typ, Expression*expr)
+: type_(typ), expr_(expr)
 {
 }
diff --git a/vhdlpp/sequential.h b/vhdlpp/sequential.h
index 13a3f5947..b0fa8ac07 100644
--- a/vhdlpp/sequential.h
+++ b/vhdlpp/sequential.h
@@ -334,7 +334,7 @@ class WaitForStmt : public SequentialStmt {
 class WaitStmt : public SequentialStmt {
     public:
       typedef enum { ON, UNTIL, FINAL } wait_type_t;
-      WaitStmt(wait_type_t type, Expression*expression);
+      WaitStmt(wait_type_t typ, Expression*expression);
 
       void dump(ostream&out, int indent) const;
       int elaborate(Entity*ent, ScopeBase*scope);
diff --git a/vhdlpp/subprogram.h b/vhdlpp/subprogram.h
index 08473239e..82ba804d1 100644
--- a/vhdlpp/subprogram.h
+++ b/vhdlpp/subprogram.h
@@ -146,9 +146,9 @@ class SubprogramHeader : public LineInfo {
 class SubprogramStdHeader : public SubprogramHeader
 {
     public:
-      SubprogramStdHeader(perm_string name, std::list<InterfacePort*>*ports,
+      SubprogramStdHeader(perm_string nam, std::list<InterfacePort*>*ports,
               const VType*return_type) :
-          SubprogramHeader(name, ports, return_type) {}
+          SubprogramHeader(nam, ports, return_type) {}
       virtual ~SubprogramStdHeader() {};
 
       bool is_std() const { return true; }