diff --git a/include/SFML/Graphics/BlendMode.hpp b/include/SFML/Graphics/BlendMode.hpp
index 4e4a167ed..a59be8132 100644
--- a/include/SFML/Graphics/BlendMode.hpp
+++ b/include/SFML/Graphics/BlendMode.hpp
@@ -46,7 +46,7 @@ struct SFML_GRAPHICS_API BlendMode
     /// \brief Enumeration of the blending factors
     ///
     ////////////////////////////////////////////////////////
-    enum BlendFactor
+    enum Factor
     {
         Zero,             ///< (0,0,0,0)
         One,              ///< (1,1,1,1)
@@ -65,7 +65,7 @@ struct SFML_GRAPHICS_API BlendMode
     /// \brief Enumeration of the blending equations
     ///
     ////////////////////////////////////////////////////////
-    enum BlendEquation
+    enum Equation
     {
         Add,             ///< Pixel = Src * SrcFactor + Dst * DstFactor
         Subtract         ///< Pixel = Src * SrcFactor - Dst * DstFactor
@@ -90,19 +90,19 @@ struct SFML_GRAPHICS_API BlendMode
     /// \param alphaBlendEquation     Specifies how to combine the source and destination alphas.
     ///
     ////////////////////////////////////////////////////////////
-    BlendMode(BlendFactor colorSourceFactor, BlendFactor colorDestinationFactor,
-        BlendEquation colorBlendEquation, BlendFactor alphaSourceFactor,
-        BlendFactor alphaDestinationFactor, BlendEquation alphaBlendEquation);
+    BlendMode(Factor colorSourceFactor, Factor colorDestinationFactor,
+        Equation colorBlendEquation, Factor alphaSourceFactor,
+        Factor alphaDestinationFactor, Equation alphaBlendEquation);
 
     ////////////////////////////////////////////////////////////
     // Member Data
     ////////////////////////////////////////////////////////////
-    BlendFactor   colorSrcFactor;  ///< Source blending factor for the color channels
-    BlendFactor   colorDstFactor;  ///< Destination blending factor for the color channels
-    BlendEquation colorEquation;   ///< Blending equation for the color channels
-    BlendFactor   alphaSrcFactor;  ///< Source blending factor for the alpha channel
-    BlendFactor   alphaDstFactor;  ///< Destination blending factor for the alpha channel
-    BlendEquation alphaEquation;   ///< Blending equation for the alpha channel
+    Factor   colorSrcFactor;  ///< Source blending factor for the color channels
+    Factor   colorDstFactor;  ///< Destination blending factor for the color channels
+    Equation colorEquation;   ///< Blending equation for the color channels
+    Factor   alphaSrcFactor;  ///< Source blending factor for the alpha channel
+    Factor   alphaDstFactor;  ///< Destination blending factor for the alpha channel
+    Equation alphaEquation;   ///< Blending equation for the alpha channel
 };
 
 ////////////////////////////////////////////////////////////
diff --git a/src/SFML/Graphics/BlendMode.cpp b/src/SFML/Graphics/BlendMode.cpp
index 9a7ab2279..15b2ca5cc 100644
--- a/src/SFML/Graphics/BlendMode.cpp
+++ b/src/SFML/Graphics/BlendMode.cpp
@@ -57,9 +57,9 @@ alphaEquation (BlendMode::Add)
 
 
 ////////////////////////////////////////////////////////////
-BlendMode::BlendMode(BlendFactor colorSourceFactor, BlendFactor colorDestinationFactor,
-    BlendEquation colorBlendEquation, BlendFactor alphaSourceFactor,
-    BlendFactor alphaDestinationFactor, BlendEquation alphaBlendEquation) :
+BlendMode::BlendMode(Factor colorSourceFactor, Factor colorDestinationFactor,
+    Equation colorBlendEquation, Factor alphaSourceFactor,
+    Factor alphaDestinationFactor, Equation alphaBlendEquation) :
 colorSrcFactor(colorSourceFactor),
 colorDstFactor(colorDestinationFactor),
 colorEquation (colorBlendEquation),
diff --git a/src/SFML/Graphics/RenderTarget.cpp b/src/SFML/Graphics/RenderTarget.cpp
index 4209ce7be..61dfb67a6 100644
--- a/src/SFML/Graphics/RenderTarget.cpp
+++ b/src/SFML/Graphics/RenderTarget.cpp
@@ -37,8 +37,8 @@
 
 namespace
 {
-    // Convert an sf::BlendMode::BlendFactor constant to the corresponding OpenGL constant.
-    sf::Uint32 factorToGlConstant(sf::BlendMode::BlendFactor blendFactor)
+    // Convert an sf::BlendMode::Factor constant to the corresponding OpenGL constant.
+    sf::Uint32 factorToGlConstant(sf::BlendMode::Factor blendFactor)
     {
         switch (blendFactor)
         {
@@ -58,7 +58,7 @@ namespace
 
 
     // Convert an sf::BlendMode::BlendEquation constant to the corresponding OpenGL constant.
-    sf::Uint32 equationToGlConstant(sf::BlendMode::BlendEquation blendEquation)
+    sf::Uint32 equationToGlConstant(sf::BlendMode::Equation blendEquation)
     {
         switch (blendEquation)
         {