diff --git a/include/llvm/Value.h b/include/llvm/Value.h
index e92d6fc6cbc..319115375dd 100644
--- a/include/llvm/Value.h
+++ b/include/llvm/Value.h
@@ -78,7 +78,7 @@ public:
   inline const Type *getType() const { return Ty; }
   
   // All values can potentially be named...
-  inline bool               hasName() const { return Name != ""; }
+  inline bool               hasName() const { return !Name.empty(); }
   inline const std::string &getName() const { return Name; }
 
   virtual void setName(const std::string &name, SymbolTable * = 0) {
diff --git a/lib/VMCore/Function.cpp b/lib/VMCore/Function.cpp
index ff7905b73f5..4714d3b2584 100644
--- a/lib/VMCore/Function.cpp
+++ b/lib/VMCore/Function.cpp
@@ -266,5 +266,5 @@ void GlobalVariable::setName(const std::string &name, SymbolTable *ST) {
 	 "Invalid symtab argument!");
   if ((P = getParent()) && hasName()) P->getSymbolTable().remove(this);
   Value::setName(name);
-  if (P && getName() != "") P->getSymbolTable().insert(this);
+  if (P && hasName()) P->getSymbolTable().insert(this);
 }