diff --git a/src/ArduinoJson.hpp b/src/ArduinoJson.hpp
index f99f7377..7075a3be 100644
--- a/src/ArduinoJson.hpp
+++ b/src/ArduinoJson.hpp
@@ -49,7 +49,7 @@
 namespace ArduinoJson {
 using ARDUINOJSON_NAMESPACE::JsonArray;
 using ARDUINOJSON_NAMESPACE::JsonArrayConst;
-typedef ARDUINOJSON_NAMESPACE::Float JsonFloat;
+using ARDUINOJSON_NAMESPACE::JsonFloat;
 typedef ARDUINOJSON_NAMESPACE::Integer JsonInteger;
 using ARDUINOJSON_NAMESPACE::JsonObject;
 using ARDUINOJSON_NAMESPACE::JsonObjectConst;
diff --git a/src/ArduinoJson/Json/JsonSerializer.hpp b/src/ArduinoJson/Json/JsonSerializer.hpp
index 4a5887be..bc13b620 100644
--- a/src/ArduinoJson/Json/JsonSerializer.hpp
+++ b/src/ArduinoJson/Json/JsonSerializer.hpp
@@ -58,7 +58,7 @@ class JsonSerializer : public Visitor<size_t> {
     return bytesWritten();
   }
 
-  size_t visitFloat(Float value) {
+  size_t visitFloat(JsonFloat value) {
     _formatter.writeFloat(value);
     return bytesWritten();
   }
diff --git a/src/ArduinoJson/Numbers/Float.hpp b/src/ArduinoJson/Numbers/JsonFloat.hpp
similarity index 85%
rename from src/ArduinoJson/Numbers/Float.hpp
rename to src/ArduinoJson/Numbers/JsonFloat.hpp
index 4c6c0f75..a88439fe 100644
--- a/src/ArduinoJson/Numbers/Float.hpp
+++ b/src/ArduinoJson/Numbers/JsonFloat.hpp
@@ -10,8 +10,8 @@
 namespace ARDUINOJSON_NAMESPACE {
 
 #if ARDUINOJSON_USE_DOUBLE
-typedef double Float;
+typedef double JsonFloat;
 #else
-typedef float Float;
+typedef float JsonFloat;
 #endif
 }  // namespace ARDUINOJSON_NAMESPACE
diff --git a/src/ArduinoJson/Numbers/convertNumber.hpp b/src/ArduinoJson/Numbers/convertNumber.hpp
index 6dd400ed..9a78bdd5 100644
--- a/src/ArduinoJson/Numbers/convertNumber.hpp
+++ b/src/ArduinoJson/Numbers/convertNumber.hpp
@@ -14,8 +14,8 @@
 #  pragma GCC diagnostic ignored "-Wconversion"
 #endif
 
-#include <ArduinoJson/Numbers/Float.hpp>
 #include <ArduinoJson/Numbers/FloatTraits.hpp>
+#include <ArduinoJson/Numbers/JsonFloat.hpp>
 #include <ArduinoJson/Polyfills/limits.hpp>
 #include <ArduinoJson/Polyfills/type_traits.hpp>
 
diff --git a/src/ArduinoJson/Numbers/parseNumber.hpp b/src/ArduinoJson/Numbers/parseNumber.hpp
index 0273d075..4730bd97 100644
--- a/src/ArduinoJson/Numbers/parseNumber.hpp
+++ b/src/ArduinoJson/Numbers/parseNumber.hpp
@@ -19,7 +19,7 @@ template <typename A, typename B>
 struct choose_largest : conditional<(sizeof(A) > sizeof(B)), A, B> {};
 
 inline bool parseNumber(const char* s, VariantData& result) {
-  typedef FloatTraits<Float> traits;
+  typedef FloatTraits<JsonFloat> traits;
   typedef choose_largest<traits::mantissa_type, UInt>::type mantissa_t;
   typedef traits::exponent_type exponent_t;
 
@@ -136,8 +136,8 @@ inline bool parseNumber(const char* s, VariantData& result) {
   if (*s != '\0')
     return false;
 
-  Float final_result =
-      traits::make_float(static_cast<Float>(mantissa), exponent);
+  JsonFloat final_result =
+      traits::make_float(static_cast<JsonFloat>(mantissa), exponent);
 
   result.setFloat(is_negative ? -final_result : final_result);
   return true;
diff --git a/src/ArduinoJson/Variant/ConverterImpl.hpp b/src/ArduinoJson/Variant/ConverterImpl.hpp
index 888cfed7..cf6d2cb0 100644
--- a/src/ArduinoJson/Variant/ConverterImpl.hpp
+++ b/src/ArduinoJson/Variant/ConverterImpl.hpp
@@ -101,7 +101,7 @@ struct Converter<T, typename enable_if<is_floating_point<T>::value>::type>
   static void toJson(T src, VariantRef dst) {
     VariantData* data = getData(dst);
     if (data)
-      data->setFloat(static_cast<Float>(src));
+      data->setFloat(static_cast<JsonFloat>(src));
   }
 
   static T fromJson(VariantConstRef src) {
diff --git a/src/ArduinoJson/Variant/VariantCompare.hpp b/src/ArduinoJson/Variant/VariantCompare.hpp
index a4342e96..968e919b 100644
--- a/src/ArduinoJson/Variant/VariantCompare.hpp
+++ b/src/ArduinoJson/Variant/VariantCompare.hpp
@@ -52,7 +52,7 @@ struct Comparer<T, typename enable_if<is_integral<T>::value ||
 
   explicit Comparer(T value) : rhs(value) {}
 
-  CompareResult visitFloat(Float lhs) {
+  CompareResult visitFloat(JsonFloat lhs) {
     return arithmeticCompare(lhs, rhs);
   }
 
@@ -142,8 +142,8 @@ struct VariantComparer : ComparerBase {
     return accept(comparer);
   }
 
-  CompareResult visitFloat(Float lhs) {
-    Comparer<Float> comparer(lhs);
+  CompareResult visitFloat(JsonFloat lhs) {
+    Comparer<JsonFloat> comparer(lhs);
     return accept(comparer);
   }
 
diff --git a/src/ArduinoJson/Variant/VariantContent.hpp b/src/ArduinoJson/Variant/VariantContent.hpp
index 2f3324a5..240960bf 100644
--- a/src/ArduinoJson/Variant/VariantContent.hpp
+++ b/src/ArduinoJson/Variant/VariantContent.hpp
@@ -7,8 +7,8 @@
 #include <stddef.h>  // size_t
 
 #include <ArduinoJson/Collection/CollectionData.hpp>
-#include <ArduinoJson/Numbers/Float.hpp>
 #include <ArduinoJson/Numbers/Integer.hpp>
+#include <ArduinoJson/Numbers/JsonFloat.hpp>
 
 namespace ARDUINOJSON_NAMESPACE {
 
@@ -44,7 +44,7 @@ struct RawData {
 };
 
 union VariantContent {
-  Float asFloat;
+  JsonFloat asFloat;
   bool asBoolean;
   UInt asUnsignedInteger;
   Integer asSignedInteger;
diff --git a/src/ArduinoJson/Variant/VariantData.hpp b/src/ArduinoJson/Variant/VariantData.hpp
index 6b037fa3..9eb4bb47 100644
--- a/src/ArduinoJson/Variant/VariantData.hpp
+++ b/src/ArduinoJson/Variant/VariantData.hpp
@@ -172,7 +172,7 @@ class VariantData {
     _content.asBoolean = value;
   }
 
-  void setFloat(Float value) {
+  void setFloat(JsonFloat value) {
     setType(VALUE_IS_FLOAT);
     _content.asFloat = value;
   }
diff --git a/src/ArduinoJson/Variant/Visitor.hpp b/src/ArduinoJson/Variant/Visitor.hpp
index b37cdbb3..f62301e6 100644
--- a/src/ArduinoJson/Variant/Visitor.hpp
+++ b/src/ArduinoJson/Variant/Visitor.hpp
@@ -5,8 +5,8 @@
 #pragma once
 
 #include <ArduinoJson/Collection/CollectionData.hpp>
-#include <ArduinoJson/Numbers/Float.hpp>
 #include <ArduinoJson/Numbers/Integer.hpp>
+#include <ArduinoJson/Numbers/JsonFloat.hpp>
 
 namespace ARDUINOJSON_NAMESPACE {
 
@@ -22,7 +22,7 @@ struct Visitor {
     return TResult();
   }
 
-  TResult visitFloat(Float) {
+  TResult visitFloat(JsonFloat) {
     return TResult();
   }