diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index 19b052ba81919..20eef7246ed56 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -243,7 +243,7 @@ public:
     static const char TRUE[];
 
     // Value for KEY_FOCUS_DISTANCES.
-    static const char INFINITY[];
+    static const char FOCUS_DISTANCE_INFINITY[];
 
     // Values for white balance settings.
     static const char WHITE_BALANCE_AUTO[];
diff --git a/libs/camera/CameraParameters.cpp b/libs/camera/CameraParameters.cpp
index 035fa9fa67b58..7b4c7f6aaab63 100644
--- a/libs/camera/CameraParameters.cpp
+++ b/libs/camera/CameraParameters.cpp
@@ -72,7 +72,7 @@ const char CameraParameters::KEY_SMOOTH_ZOOM_SUPPORTED[] = "smooth-zoom-supporte
 const char CameraParameters::KEY_FOCUS_DISTANCES[] = "focus-distances";
 
 const char CameraParameters::TRUE[] = "true";
-const char CameraParameters::INFINITY[] = "Infinity";
+const char CameraParameters::FOCUS_DISTANCE_INFINITY[] = "Infinity";
 
 // Values for white balance settings.
 const char CameraParameters::WHITE_BALANCE_AUTO[] = "auto";