diff --git a/include/llvm/ADT/APFloat.h b/include/llvm/ADT/APFloat.h
index 8df2ce0f64b..06133762536 100644
--- a/include/llvm/ADT/APFloat.h
+++ b/include/llvm/ADT/APFloat.h
@@ -362,7 +362,7 @@ public:
   ///
   /// The current implementation of isNormal() differs from this by treating
   /// subnormal values as normal values.
-  bool isIEEENormal() const { return !isDenormal() && isFiniteNonZero(); }
+  bool isNormal() const { return !isDenormal() && isFiniteNonZero(); }
 
   /// Returns true if and only if the current value is zero, subnormal, or
   /// normal.
@@ -394,7 +394,6 @@ public:
   fltCategory getCategory() const { return category; }
   const fltSemantics &getSemantics() const { return *semantics; }
   bool isNonZero() const { return category != fcZero; }
-  bool isNormal() const { return category == fcNormal; }
   bool isFiniteNonZero() const { return isFinite() && !isZero(); }
   bool isPosZero() const { return isZero() && !isNegative(); }
   bool isNegZero() const { return isZero() && isNegative(); }
diff --git a/unittests/ADT/APFloatTest.cpp b/unittests/ADT/APFloatTest.cpp
index 9f3980f7d29..85167937565 100644
--- a/unittests/ADT/APFloatTest.cpp
+++ b/unittests/ADT/APFloatTest.cpp
@@ -1417,15 +1417,15 @@ TEST(APFloatTest, isNegative) {
   EXPECT_TRUE(APFloat::getSNaN(APFloat::IEEEsingle, true).isNegative());
 }
 
-TEST(APFloatTest, isIEEENormal) {
+TEST(APFloatTest, isNormal) {
   APFloat t(APFloat::IEEEsingle, "0x1p+0");
-  EXPECT_TRUE(t.isIEEENormal());
+  EXPECT_TRUE(t.isNormal());
   
-  EXPECT_FALSE(APFloat::getInf(APFloat::IEEEsingle, false).isIEEENormal());
-  EXPECT_FALSE(APFloat::getZero(APFloat::IEEEsingle, false).isIEEENormal());
-  EXPECT_FALSE(APFloat::getNaN(APFloat::IEEEsingle, false).isIEEENormal());
-  EXPECT_FALSE(APFloat::getSNaN(APFloat::IEEEsingle, false).isIEEENormal());  
-  EXPECT_FALSE(APFloat(APFloat::IEEEsingle, "0x1p-149").isIEEENormal());
+  EXPECT_FALSE(APFloat::getInf(APFloat::IEEEsingle, false).isNormal());
+  EXPECT_FALSE(APFloat::getZero(APFloat::IEEEsingle, false).isNormal());
+  EXPECT_FALSE(APFloat::getNaN(APFloat::IEEEsingle, false).isNormal());
+  EXPECT_FALSE(APFloat::getSNaN(APFloat::IEEEsingle, false).isNormal());  
+  EXPECT_FALSE(APFloat(APFloat::IEEEsingle, "0x1p-149").isNormal());
 }
 
 TEST(APFloatTest, isFinite) {