Index: src/SynTree/Declaration.h
===================================================================
--- src/SynTree/Declaration.h	(revision fa2e1835ade3aa1f3812f145ebfef6cd082dbb51)
+++ src/SynTree/Declaration.h	(revision 19a8c403fb93aa73a6fcbdb1fe3f32f62a4dfa0a)
@@ -450,20 +450,20 @@
 
 
-class InlineValueDecl : public DeclarationWithType {
+class InlineMemberDecl : public DeclarationWithType {
 	typedef DeclarationWithType Parent;
   public:
 	Type * type;
 
-	InlineValueDecl( const std::string & name, Type::StorageClasses scs, LinkageSpec::Spec linkage, Type * type,
+	InlineMemberDecl( const std::string & name, Type::StorageClasses scs, LinkageSpec::Spec linkage, Type * type,
 				const std::list< Attribute * > attributes = std::list< Attribute * >(), Type::FuncSpecifiers fs = Type::FuncSpecifiers() );
-	InlineValueDecl( const InlineValueDecl & other );
-	virtual ~InlineValueDecl();
+	InlineMemberDecl( const InlineMemberDecl & other );
+	virtual ~InlineMemberDecl();
 
 	virtual Type * get_type() const override { return type; }
 	virtual void set_type(Type * newType) override { type = newType; }
 
-	static InlineValueDecl * newInlineValueDecl( const std::string & name, Type * type );
-
-	virtual InlineValueDecl * clone() const override { return new InlineValueDecl( *this ); }
+	static InlineMemberDecl * newInlineMemberDecl( const std::string & name, Type * type );
+
+	virtual InlineMemberDecl * clone() const override { return new InlineMemberDecl( *this ); }
 	virtual void accept( Visitor & v ) override { v.visit( this ); }
 	virtual void accept( Visitor & v ) const override { v.visit( this ); }
Index: src/SynTree/InlineMemberDecl.cc
===================================================================
--- src/SynTree/InlineMemberDecl.cc	(revision 19a8c403fb93aa73a6fcbdb1fe3f32f62a4dfa0a)
+++ src/SynTree/InlineMemberDecl.cc	(revision 19a8c403fb93aa73a6fcbdb1fe3f32f62a4dfa0a)
@@ -0,0 +1,57 @@
+#include <list>                  // for list
+#include <ostream>               // for operator<<, ostream, basic_ostream
+#include <string>                // for operator<<, string, char_traits, ope...
+
+#include "Attribute.h"           // for Attribute
+#include "Declaration.h"
+#include "Common/utility.h"      // for maybeClone, printAll
+#include "LinkageSpec.h"         // for Spec, linkageName, Cforall
+#include "Type.h"                // for Type, Type::StorageClasses, Type::Fu...
+
+InlineMemberDecl::InlineMemberDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage,
+Type * type, const std::list< Attribute * >attributes, Type::FuncSpecifiers fs) 
+    : Parent( name, scs, linkage, attributes, fs ), type( type ) {}
+
+InlineMemberDecl::InlineMemberDecl( const InlineMemberDecl &other) 
+    : Parent( other), type( maybeClone( other.type ) ) {}
+
+InlineMemberDecl::~InlineMemberDecl() { delete type; }
+
+InlineMemberDecl * InlineMemberDecl::newInlineMemberDecl( const std::string &name, Type * type ) {
+    return new InlineMemberDecl( name, Type::StorageClasses(), LinkageSpec::C, type );
+}
+
+void InlineMemberDecl::print( std::ostream &os, Indenter indent ) const {
+    if ( name != "" ) os << name << ": ";
+
+	if ( linkage != LinkageSpec::Cforall ) {
+		os << LinkageSpec::name( linkage ) << " ";
+	} // if
+
+	get_storageClasses().print( os );
+
+	if ( type ) {
+		type->print( os, indent );
+	} else {
+		os << " untyped entity ";
+	} // if
+
+	if ( ! attributes.empty() ) {
+		os << std::endl << indent << "... with attributes:" << std::endl;
+		printAll( attributes, os, indent+1 );
+	} // if
+
+}
+
+void InlineMemberDecl::printShort( std::ostream &os, Indenter indent ) const {
+    if ( name != "" ) os << name << ": ";
+
+	get_storageClasses().print( os );
+
+	if ( type ) {
+		type->print( os, indent );
+	} else {
+		os << "untyped entity ";
+	} // if
+    
+}
Index: src/SynTree/InlineValueDecl.cc
===================================================================
--- src/SynTree/InlineValueDecl.cc	(revision fa2e1835ade3aa1f3812f145ebfef6cd082dbb51)
+++ 	(revision )
@@ -1,57 +1,0 @@
-#include <list>                  // for list
-#include <ostream>               // for operator<<, ostream, basic_ostream
-#include <string>                // for operator<<, string, char_traits, ope...
-
-#include "Attribute.h"           // for Attribute
-#include "Declaration.h"
-#include "Common/utility.h"      // for maybeClone, printAll
-#include "LinkageSpec.h"         // for Spec, linkageName, Cforall
-#include "Type.h"                // for Type, Type::StorageClasses, Type::Fu...
-
-InlineValueDecl::InlineValueDecl( const std::string &name, Type::StorageClasses scs, LinkageSpec::Spec linkage,
-Type * type, const std::list< Attribute * >attributes, Type::FuncSpecifiers fs) 
-    : Parent( name, scs, linkage, attributes, fs ), type( type ) {}
-
-InlineValueDecl::InlineValueDecl( const InlineValueDecl &other) 
-    : Parent( other), type( maybeClone( other.type ) ) {}
-
-InlineValueDecl::~InlineValueDecl() { delete type; }
-
-InlineValueDecl * InlineValueDecl::newInlineValueDecl( const std::string &name, Type * type ) {
-    return new InlineValueDecl( name, Type::StorageClasses(), LinkageSpec::C, type );
-}
-
-void InlineValueDecl::print( std::ostream &os, Indenter indent ) const {
-    if ( name != "" ) os << name << ": ";
-
-	if ( linkage != LinkageSpec::Cforall ) {
-		os << LinkageSpec::name( linkage ) << " ";
-	} // if
-
-	get_storageClasses().print( os );
-
-	if ( type ) {
-		type->print( os, indent );
-	} else {
-		os << " untyped entity ";
-	} // if
-
-	if ( ! attributes.empty() ) {
-		os << std::endl << indent << "... with attributes:" << std::endl;
-		printAll( attributes, os, indent+1 );
-	} // if
-
-}
-
-void InlineValueDecl::printShort( std::ostream &os, Indenter indent ) const {
-    if ( name != "" ) os << name << ": ";
-
-	get_storageClasses().print( os );
-
-	if ( type ) {
-		type->print( os, indent );
-	} else {
-		os << "untyped entity ";
-	} // if
-    
-}
Index: src/SynTree/Mutator.h
===================================================================
--- src/SynTree/Mutator.h	(revision fa2e1835ade3aa1f3812f145ebfef6cd082dbb51)
+++ src/SynTree/Mutator.h	(revision 19a8c403fb93aa73a6fcbdb1fe3f32f62a4dfa0a)
@@ -36,5 +36,5 @@
 	virtual DirectiveDecl * mutate( DirectiveDecl * directiveDecl ) = 0;
 	virtual StaticAssertDecl * mutate( StaticAssertDecl * assertDecl ) = 0;
-	virtual DeclarationWithType * mutate( InlineValueDecl * inlineValueDecl ) = 0;
+	virtual DeclarationWithType * mutate( InlineMemberDecl * InlineMemberDecl ) = 0;
 
 	virtual CompoundStmt * mutate( CompoundStmt * compoundStmt ) = 0;
Index: src/SynTree/SynTree.h
===================================================================
--- src/SynTree/SynTree.h	(revision fa2e1835ade3aa1f3812f145ebfef6cd082dbb51)
+++ src/SynTree/SynTree.h	(revision 19a8c403fb93aa73a6fcbdb1fe3f32f62a4dfa0a)
@@ -38,5 +38,5 @@
 class DirectiveDecl;
 class StaticAssertDecl;
-class InlineValueDecl;
+class InlineMemberDecl;
 
 class Statement;
Index: src/SynTree/Visitor.h
===================================================================
--- src/SynTree/Visitor.h	(revision fa2e1835ade3aa1f3812f145ebfef6cd082dbb51)
+++ src/SynTree/Visitor.h	(revision 19a8c403fb93aa73a6fcbdb1fe3f32f62a4dfa0a)
@@ -49,6 +49,6 @@
 	virtual void visit( StaticAssertDecl * node ) { visit( const_cast<const StaticAssertDecl *>(node) ); }
 	virtual void visit( const StaticAssertDecl * assertDecl ) = 0;
-	virtual void visit( InlineValueDecl * node ) { visit( const_cast<const InlineValueDecl *>(node) ); }
-	virtual void visit( const InlineValueDecl * valueDecl ) = 0;
+	virtual void visit( InlineMemberDecl * node ) { visit( const_cast<const InlineMemberDecl *>(node) ); }
+	virtual void visit( const InlineMemberDecl * valueDecl ) = 0;
 
 	virtual void visit( CompoundStmt * node ) { visit( const_cast<const CompoundStmt *>(node) ); }
Index: src/SynTree/module.mk
===================================================================
--- src/SynTree/module.mk	(revision fa2e1835ade3aa1f3812f145ebfef6cd082dbb51)
+++ src/SynTree/module.mk	(revision 19a8c403fb93aa73a6fcbdb1fe3f32f62a4dfa0a)
@@ -42,5 +42,5 @@
       SynTree/Initializer.cc \
       SynTree/Initializer.h \
-      SynTree/InlineValueDecl.cc \
+      SynTree/InlineMemberDecl.cc \
       SynTree/Label.h \
       SynTree/LinkageSpec.cc \