ipa: raspberrypi: Rename the controller namespace from Rpi to RpiController

This avoids a namespace clash with the RPi namespace used by the ipa and
pipeline handlers, and cleans up the syntax slightly.

There are no functional changes in this commit.

Signed-off-by: Naushir Patuck <naush@raspberrypi.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>

40 files changed, 64 insertions, 64 deletions

diff --git a/src/ipa/raspberrypi/controller/agc_algorithm.hpp b/src/ipa/raspberrypi/controller/agc_algorithm.hpp
index f29bb3ac..b4ea54fb 100644
--- a/src/ipa/raspberrypi/controller/agc_algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/agc_algorithm.hpp
@@ -8,7 +8,7 @@
 
 #include "algorithm.hpp"
 
-namespace RPi {
+namespace RPiController {
 
 class AgcAlgorithm : public Algorithm
 {
@@ -25,4 +25,4 @@ public:
 	SetConstraintMode(std::string const &contraint_mode_name) = 0;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/algorithm.cpp b/src/ipa/raspberrypi/controller/algorithm.cpp
index 1b80e296..43ad0a2b 100644
--- a/src/ipa/raspberrypi/controller/algorithm.cpp
+++ b/src/ipa/raspberrypi/controller/algorithm.cpp
@@ -7,7 +7,7 @@
 
 #include "algorithm.hpp"
 
-using namespace RPi;
+using namespace RPiController;
 
 void Algorithm::Read([[maybe_unused]] boost::property_tree::ptree const &params)
 {
@@ -32,7 +32,7 @@ void Algorithm::Process([[maybe_unused]] StatisticsPtr &stats,
 // For registering algorithms with the system:
 
 static std::map<std::string, AlgoCreateFunc> algorithms;
-std::map<std::string, AlgoCreateFunc> const &RPi::GetAlgorithms()
+std::map<std::string, AlgoCreateFunc> const &RPiController::GetAlgorithms()
 {
 	return algorithms;
 }
diff --git a/src/ipa/raspberrypi/controller/algorithm.hpp b/src/ipa/raspberrypi/controller/algorithm.hpp
index 187c50c6..6196b2f9 100644
--- a/src/ipa/raspberrypi/controller/algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/algorithm.hpp
@@ -19,7 +19,7 @@
 
 #include <boost/property_tree/ptree.hpp>
 
-namespace RPi {
+namespace RPiController {
 
 // This defines the basic interface for all control algorithms.
 
@@ -59,4 +59,4 @@ struct RegisterAlgorithm {
 };
 std::map<std::string, AlgoCreateFunc> const &GetAlgorithms();
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/awb_algorithm.hpp b/src/ipa/raspberrypi/controller/awb_algorithm.hpp
index 22508ddd..5be0c9f4 100644
--- a/src/ipa/raspberrypi/controller/awb_algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/awb_algorithm.hpp
@@ -8,7 +8,7 @@
 
 #include "algorithm.hpp"
 
-namespace RPi {
+namespace RPiController {
 
 class AwbAlgorithm : public Algorithm
 {
@@ -19,4 +19,4 @@ public:
 	virtual void SetManualGains(double manual_r, double manual_b) = 0;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/ccm_algorithm.hpp b/src/ipa/raspberrypi/controller/ccm_algorithm.hpp
index 21806cb0..33d0e30d 100644
--- a/src/ipa/raspberrypi/controller/ccm_algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/ccm_algorithm.hpp
@@ -8,7 +8,7 @@
 
 #include "algorithm.hpp"
 
-namespace RPi {
+namespace RPiController {
 
 class CcmAlgorithm : public Algorithm
 {
@@ -18,4 +18,4 @@ public:
 	virtual void SetSaturation(double saturation) = 0;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/contrast_algorithm.hpp b/src/ipa/raspberrypi/controller/contrast_algorithm.hpp
index 9780322b..7f03bba5 100644
--- a/src/ipa/raspberrypi/controller/contrast_algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/contrast_algorithm.hpp
@@ -8,7 +8,7 @@
 
 #include "algorithm.hpp"
 
-namespace RPi {
+namespace RPiController {
 
 class ContrastAlgorithm : public Algorithm
 {
@@ -19,4 +19,4 @@ public:
 	virtual void SetContrast(double contrast) = 0;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/controller.cpp b/src/ipa/raspberrypi/controller/controller.cpp
index 7c4b04fe..22461cc4 100644
--- a/src/ipa/raspberrypi/controller/controller.cpp
+++ b/src/ipa/raspberrypi/controller/controller.cpp
@@ -11,7 +11,7 @@
 #include <boost/property_tree/json_parser.hpp>
 #include <boost/property_tree/ptree.hpp>
 
-using namespace RPi;
+using namespace RPiController;
 
 Controller::Controller()
 	: switch_mode_called_(false) {}
diff --git a/src/ipa/raspberrypi/controller/controller.hpp b/src/ipa/raspberrypi/controller/controller.hpp
index 6ba9412b..49b1a551 100644
--- a/src/ipa/raspberrypi/controller/controller.hpp
+++ b/src/ipa/raspberrypi/controller/controller.hpp
@@ -19,7 +19,7 @@
 #include "device_status.h"
 #include "metadata.hpp"
 
-namespace RPi {
+namespace RPiController {
 
 class Algorithm;
 typedef std::unique_ptr<Algorithm> AlgorithmPtr;
@@ -51,4 +51,4 @@ protected:
 	bool switch_mode_called_;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/histogram.cpp b/src/ipa/raspberrypi/controller/histogram.cpp
index 103d3f60..9916b3ed 100644
--- a/src/ipa/raspberrypi/controller/histogram.cpp
+++ b/src/ipa/raspberrypi/controller/histogram.cpp
@@ -9,7 +9,7 @@
 
 #include "histogram.hpp"
 
-using namespace RPi;
+using namespace RPiController;
 
 uint64_t Histogram::CumulativeFreq(double bin) const
 {
diff --git a/src/ipa/raspberrypi/controller/histogram.hpp b/src/ipa/raspberrypi/controller/histogram.hpp
index 06fc3aa7..90f5ac78 100644
--- a/src/ipa/raspberrypi/controller/histogram.hpp
+++ b/src/ipa/raspberrypi/controller/histogram.hpp
@@ -13,7 +13,7 @@
 // A simple histogram class, for use in particular to find "quantiles" and
 // averages between "quantiles".
 
-namespace RPi {
+namespace RPiController {
 
 class Histogram
 {
@@ -41,4 +41,4 @@ private:
 	std::vector<uint64_t> cumulative_;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/metadata.hpp b/src/ipa/raspberrypi/controller/metadata.hpp
index 1d7624a0..f3a8dfab 100644
--- a/src/ipa/raspberrypi/controller/metadata.hpp
+++ b/src/ipa/raspberrypi/controller/metadata.hpp
@@ -15,7 +15,7 @@
 
 #include <boost/any.hpp>
 
-namespace RPi {
+namespace RPiController {
 
 class Metadata
 {
@@ -74,4 +74,4 @@ private:
 
 typedef std::shared_ptr<Metadata> MetadataPtr;
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/pwl.cpp b/src/ipa/raspberrypi/controller/pwl.cpp
index 7e11d8f3..aa134a1f 100644
--- a/src/ipa/raspberrypi/controller/pwl.cpp
+++ b/src/ipa/raspberrypi/controller/pwl.cpp
@@ -10,7 +10,7 @@
 
 #include "pwl.hpp"
 
-using namespace RPi;
+using namespace RPiController;
 
 void Pwl::Read(boost::property_tree::ptree const &params)
 {
diff --git a/src/ipa/raspberrypi/controller/pwl.hpp b/src/ipa/raspberrypi/controller/pwl.hpp
index bd7c7668..4f168551 100644
--- a/src/ipa/raspberrypi/controller/pwl.hpp
+++ b/src/ipa/raspberrypi/controller/pwl.hpp
@@ -11,7 +11,7 @@
 
 #include <boost/property_tree/ptree.hpp>
 
-namespace RPi {
+namespace RPiController {
 
 class Pwl
 {
@@ -106,4 +106,4 @@ private:
 	std::vector<Point> points_;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/rpi/agc.cpp b/src/ipa/raspberrypi/controller/rpi/agc.cpp
index 3573f36b..df4d3647 100644
--- a/src/ipa/raspberrypi/controller/rpi/agc.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/agc.cpp
@@ -18,7 +18,7 @@
 
 #include "agc.hpp"
 
-using namespace RPi;
+using namespace RPiController;
 
 #define NAME "rpi.agc"
 
diff --git a/src/ipa/raspberrypi/controller/rpi/agc.hpp b/src/ipa/raspberrypi/controller/rpi/agc.hpp
index 9a7e89c1..ba7ae092 100644
--- a/src/ipa/raspberrypi/controller/rpi/agc.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/agc.hpp
@@ -20,7 +20,7 @@
 
 #define AGC_STATS_SIZE 15
 
-namespace RPi {
+namespace RPiController {
 
 struct AgcMeteringMode {
 	double weights[AGC_STATS_SIZE];
@@ -121,4 +121,4 @@ private:
 	double fixed_analogue_gain_;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/rpi/alsc.cpp b/src/ipa/raspberrypi/controller/rpi/alsc.cpp
index f610de25..42fbc8a4 100644
--- a/src/ipa/raspberrypi/controller/rpi/alsc.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/alsc.cpp
@@ -11,7 +11,7 @@
 
 // Raspberry Pi ALSC (Auto Lens Shading Correction) algorithm.
 
-using namespace RPi;
+using namespace RPiController;
 
 #define NAME "rpi.alsc"
 
diff --git a/src/ipa/raspberrypi/controller/rpi/alsc.hpp b/src/ipa/raspberrypi/controller/rpi/alsc.hpp
index 95572af0..13d1ba54 100644
--- a/src/ipa/raspberrypi/controller/rpi/alsc.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/alsc.hpp
@@ -13,7 +13,7 @@
 #include "../algorithm.hpp"
 #include "../alsc_status.h"
 
-namespace RPi {
+namespace RPiController {
 
 // Algorithm to generate automagic LSC (Lens Shading Correction) tables.
 
@@ -102,4 +102,4 @@ private:
 	double lambda_b_[ALSC_CELLS_X * ALSC_CELLS_Y];
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/rpi/awb.cpp b/src/ipa/raspberrypi/controller/rpi/awb.cpp
index a58fa11d..a5536e47 100644
--- a/src/ipa/raspberrypi/controller/rpi/awb.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/awb.cpp
@@ -10,7 +10,7 @@
 
 #include "awb.hpp"
 
-using namespace RPi;
+using namespace RPiController;
 
 #define NAME "rpi.awb"
 
diff --git a/src/ipa/raspberrypi/controller/rpi/awb.hpp b/src/ipa/raspberrypi/controller/rpi/awb.hpp
index 36925252..9124d042 100644
--- a/src/ipa/raspberrypi/controller/rpi/awb.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/awb.hpp
@@ -14,7 +14,7 @@
 #include "../pwl.hpp"
 #include "../awb_status.h"
 
-namespace RPi {
+namespace RPiController {
 
 // Control algorithm to perform AWB calculations.
 
@@ -175,4 +175,4 @@ static inline Awb::RGB operator*(Awb::RGB const &rgb, double d)
 	return d * rgb;
 }
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/rpi/black_level.cpp b/src/ipa/raspberrypi/controller/rpi/black_level.cpp
index 59c9f5a6..0629b77c 100644
--- a/src/ipa/raspberrypi/controller/rpi/black_level.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/black_level.cpp
@@ -13,7 +13,7 @@
 
 #include "black_level.hpp"
 
-using namespace RPi;
+using namespace RPiController;
 
 #define NAME "rpi.black_level"
 
diff --git a/src/ipa/raspberrypi/controller/rpi/black_level.hpp b/src/ipa/raspberrypi/controller/rpi/black_level.hpp
index 5d74c6da..65ec4d0e 100644
--- a/src/ipa/raspberrypi/controller/rpi/black_level.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/black_level.hpp
@@ -11,7 +11,7 @@
 
 // This is our implementation of the "black level algorithm".
 
-namespace RPi {
+namespace RPiController {
 
 class BlackLevel : public Algorithm
 {
@@ -27,4 +27,4 @@ private:
 	double black_level_b_;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/rpi/ccm.cpp b/src/ipa/raspberrypi/controller/rpi/ccm.cpp
index 327cb71c..a8a2caff 100644
--- a/src/ipa/raspberrypi/controller/rpi/ccm.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/ccm.cpp
@@ -13,7 +13,7 @@
 
 #include "ccm.hpp"
 
-using namespace RPi;
+using namespace RPiController;
 
 // This algorithm selects a CCM (Colour Correction Matrix) according to the
 // colour temperature estimated by AWB (interpolating between known matricies as
diff --git a/src/ipa/raspberrypi/controller/rpi/ccm.hpp b/src/ipa/raspberrypi/controller/rpi/ccm.hpp
index f6f4dee1..fcf077e7 100644
--- a/src/ipa/raspberrypi/controller/rpi/ccm.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/ccm.hpp
@@ -12,7 +12,7 @@
 #include "../ccm_algorithm.hpp"
 #include "../pwl.hpp"
 
-namespace RPi {
+namespace RPiController {
 
 // Algorithm to calculate colour matrix. Should be placed after AWB.
 
@@ -73,4 +73,4 @@ private:
 	std::atomic<double> saturation_;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/rpi/contrast.cpp b/src/ipa/raspberrypi/controller/rpi/contrast.cpp
index c8d9ab61..103153db 100644
--- a/src/ipa/raspberrypi/controller/rpi/contrast.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/contrast.cpp
@@ -11,7 +11,7 @@
 
 #include "contrast.hpp"
 
-using namespace RPi;
+using namespace RPiController;
 
 // This is a very simple control algorithm which simply retrieves the results of
 // AGC and AWB via their "status" metadata, and applies digital gain to the
diff --git a/src/ipa/raspberrypi/controller/rpi/contrast.hpp b/src/ipa/raspberrypi/controller/rpi/contrast.hpp
index 2e38a762..6836f181 100644
--- a/src/ipa/raspberrypi/controller/rpi/contrast.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/contrast.hpp
@@ -12,7 +12,7 @@
 #include "../contrast_algorithm.hpp"
 #include "../pwl.hpp"
 
-namespace RPi {
+namespace RPiController {
 
 // Back End algorithm to appaly correct digital gain. Should be placed after
 // Back End AWB.
@@ -48,4 +48,4 @@ private:
 	std::mutex mutex_;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/rpi/dpc.cpp b/src/ipa/raspberrypi/controller/rpi/dpc.cpp
index d31fae97..348e1609 100644
--- a/src/ipa/raspberrypi/controller/rpi/dpc.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/dpc.cpp
@@ -8,7 +8,7 @@
 #include "../logging.hpp"
 #include "dpc.hpp"
 
-using namespace RPi;
+using namespace RPiController;
 
 // We use the lux status so that we can apply stronger settings in darkness (if
 // necessary).
diff --git a/src/ipa/raspberrypi/controller/rpi/dpc.hpp b/src/ipa/raspberrypi/controller/rpi/dpc.hpp
index 9fb72867..d90285c4 100644
--- a/src/ipa/raspberrypi/controller/rpi/dpc.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/dpc.hpp
@@ -9,7 +9,7 @@
 #include "../algorithm.hpp"
 #include "../dpc_status.h"
 
-namespace RPi {
+namespace RPiController {
 
 // Back End algorithm to apply appropriate GEQ settings.
 
@@ -29,4 +29,4 @@ private:
 	DpcConfig config_;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/rpi/focus.cpp b/src/ipa/raspberrypi/controller/rpi/focus.cpp
index ffe44362..bab4406f 100644
--- a/src/ipa/raspberrypi/controller/rpi/focus.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/focus.cpp
@@ -11,7 +11,7 @@
 #include "../focus_status.h"
 #include "focus.hpp"
 
-using namespace RPi;
+using namespace RPiController;
 using namespace libcamera;
 
 LOG_DEFINE_CATEGORY(RPiFocus)
diff --git a/src/ipa/raspberrypi/controller/rpi/focus.hpp b/src/ipa/raspberrypi/controller/rpi/focus.hpp
index a9756ea7..131b1d0f 100644
--- a/src/ipa/raspberrypi/controller/rpi/focus.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/focus.hpp
@@ -15,7 +15,7 @@
  * control.
  */
 
-namespace RPi {
+namespace RPiController {
 
 class Focus : public Algorithm
 {
@@ -25,4 +25,4 @@ public:
 	void Process(StatisticsPtr &stats, Metadata *image_metadata) override;
 };
 
-} /* namespace RPi */
+} /* namespace RPiController */
diff --git a/src/ipa/raspberrypi/controller/rpi/geq.cpp b/src/ipa/raspberrypi/controller/rpi/geq.cpp
index ee0cb95d..b6c98414 100644
--- a/src/ipa/raspberrypi/controller/rpi/geq.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/geq.cpp
@@ -12,7 +12,7 @@
 
 #include "geq.hpp"
 
-using namespace RPi;
+using namespace RPiController;
 
 // We use the lux status so that we can apply stronger settings in darkness (if
 // necessary).
diff --git a/src/ipa/raspberrypi/controller/rpi/geq.hpp b/src/ipa/raspberrypi/controller/rpi/geq.hpp
index 7d4bd38d..8ba3046b 100644
--- a/src/ipa/raspberrypi/controller/rpi/geq.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/geq.hpp
@@ -9,7 +9,7 @@
 #include "../algorithm.hpp"
 #include "../geq_status.h"
 
-namespace RPi {
+namespace RPiController {
 
 // Back End algorithm to apply appropriate GEQ settings.
 
@@ -31,4 +31,4 @@ private:
 	GeqConfig config_;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/rpi/lux.cpp b/src/ipa/raspberrypi/controller/rpi/lux.cpp
index 154db153..5acd49a0 100644
--- a/src/ipa/raspberrypi/controller/rpi/lux.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/lux.cpp
@@ -13,7 +13,7 @@
 
 #include "lux.hpp"
 
-using namespace RPi;
+using namespace RPiController;
 
 #define NAME "rpi.lux"
 
diff --git a/src/ipa/raspberrypi/controller/rpi/lux.hpp b/src/ipa/raspberrypi/controller/rpi/lux.hpp
index eb935409..7b6c7258 100644
--- a/src/ipa/raspberrypi/controller/rpi/lux.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/lux.hpp
@@ -14,7 +14,7 @@
 
 // This is our implementation of the "lux control algorithm".
 
-namespace RPi {
+namespace RPiController {
 
 class Lux : public Algorithm
 {
@@ -39,4 +39,4 @@ private:
 	std::mutex mutex_;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/rpi/noise.cpp b/src/ipa/raspberrypi/controller/rpi/noise.cpp
index 1b84ecb0..9e9eaf1b 100644
--- a/src/ipa/raspberrypi/controller/rpi/noise.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/noise.cpp
@@ -13,7 +13,7 @@
 
 #include "noise.hpp"
 
-using namespace RPi;
+using namespace RPiController;
 
 #define NAME "rpi.noise"
 
diff --git a/src/ipa/raspberrypi/controller/rpi/noise.hpp b/src/ipa/raspberrypi/controller/rpi/noise.hpp
index 25bf1885..6f6e0be9 100644
--- a/src/ipa/raspberrypi/controller/rpi/noise.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/noise.hpp
@@ -11,7 +11,7 @@
 
 // This is our implementation of the "noise algorithm".
 
-namespace RPi {
+namespace RPiController {
 
 class Noise : public Algorithm
 {
@@ -29,4 +29,4 @@ private:
 	std::atomic<double> mode_factor_;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/rpi/sdn.cpp b/src/ipa/raspberrypi/controller/rpi/sdn.cpp
index 28d9d983..aa82830b 100644
--- a/src/ipa/raspberrypi/controller/rpi/sdn.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/sdn.cpp
@@ -10,7 +10,7 @@
 
 #include "sdn.hpp"
 
-using namespace RPi;
+using namespace RPiController;
 
 // Calculate settings for the spatial denoise block using the noise profile in
 // the image metadata.
diff --git a/src/ipa/raspberrypi/controller/rpi/sdn.hpp b/src/ipa/raspberrypi/controller/rpi/sdn.hpp
index d48aab7e..486c000d 100644
--- a/src/ipa/raspberrypi/controller/rpi/sdn.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/sdn.hpp
@@ -8,7 +8,7 @@
 
 #include "../algorithm.hpp"
 
-namespace RPi {
+namespace RPiController {
 
 // Algorithm to calculate correct spatial denoise (SDN) settings.
 
@@ -26,4 +26,4 @@ private:
 	double strength_;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp
index 356c1058..c953a7d9 100644
--- a/src/ipa/raspberrypi/controller/rpi/sharpen.cpp
+++ b/src/ipa/raspberrypi/controller/rpi/sharpen.cpp
@@ -12,7 +12,7 @@
 
 #include "sharpen.hpp"
 
-using namespace RPi;
+using namespace RPiController;
 
 #define NAME "rpi.sharpen"
 
diff --git a/src/ipa/raspberrypi/controller/rpi/sharpen.hpp b/src/ipa/raspberrypi/controller/rpi/sharpen.hpp
index 568521b9..13a076a8 100644
--- a/src/ipa/raspberrypi/controller/rpi/sharpen.hpp
+++ b/src/ipa/raspberrypi/controller/rpi/sharpen.hpp
@@ -11,7 +11,7 @@
 
 // This is our implementation of the "sharpen algorithm".
 
-namespace RPi {
+namespace RPiController {
 
 class Sharpen : public SharpenAlgorithm
 {
@@ -31,4 +31,4 @@ private:
 	double user_strength_;
 };
 
-} // namespace RPi
+} // namespace RPiController
diff --git a/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp b/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp
index 3b27a745..ca800308 100644
--- a/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp
+++ b/src/ipa/raspberrypi/controller/sharpen_algorithm.hpp
@@ -8,7 +8,7 @@
 
 #include "algorithm.hpp"
 
-namespace RPi {
+namespace RPiController {
 
 class SharpenAlgorithm : public Algorithm
 {
@@ -18,4 +18,4 @@ public:
 	virtual void SetStrength(double strength) = 0;
 };
 
-} // namespace RPi
+} // namespace RPiController