diff --git a/src/libprojectM/PCM.cpp b/src/libprojectM/PCM.cpp
index d7f6da4fe..3c5c5bde4 100755
--- a/src/libprojectM/PCM.cpp
+++ b/src/libprojectM/PCM.cpp
@@ -108,14 +108,14 @@ void PCM::addPCMfloat(const float* PCMdata, size_t samples)
     float a, sum = 0, max = 0;
     for (size_t i = 0; i < samples; i++)
     {
-        size_t j=(i+start)%maxsamples;
+        size_t j=(i+start)%maxSamples;
         a=pcmL[j] = PCMdata[i];
         pcmR[j] = PCMdata[i];
         sum += std::abs(a);
         max = std::max(max, a);
     }
-    start = (start+samples)%maxsamples;
-    newsamples += samples;
+    start = (start+samples)%maxSamples;
+    newSamples += samples;
     level = leveler->updateLevel(samples, sum, max);
 }
 
@@ -127,14 +127,14 @@ void PCM::addPCMfloat_2ch(const float* PCMdata, size_t count)
     float a, b, sum = 0, max = 0;
     for (size_t i = 0; i < samples; i++)
     {
-        size_t j=(start+i)%maxsamples;
+        size_t j=(start+i)%maxSamples;
         a = pcmL[j] = PCMdata[i*2];
         b = pcmR[j] = PCMdata[i*2+1];
         sum += std::abs(a) + std::abs(b);
         max = std::max(std::max(max, std::abs(a)), std::abs(b));
     }
-    start = (start + samples) % maxsamples;
-    newsamples += samples;
+    start = (start + samples) % maxSamples;
+    newSamples += samples;
     level = leveler->updateLevel(samples, sum / 2, max);
 }
 
@@ -144,14 +144,14 @@ void PCM::addPCM16Data(const short* pcm_data, size_t samples)
     float a, b, sum = 0, max = 0;
     for (size_t i = 0; i < samples; ++i)
     {
-        size_t j = (i + start) % maxsamples;
+        size_t j = (i + start) % maxSamples;
         a = pcmL[j] = (pcm_data[i * 2 + 0] / 16384.0);
         b = pcmR[j] = (pcm_data[i * 2 + 1] / 16384.0);
         sum += std::abs(a) + std::abs(b);
         max = std::max(std::max(max, a), b);
     }
-    start = (start + samples) % maxsamples;
-    newsamples += samples;
+    start = (start + samples) % maxSamples;
+    newSamples += samples;
     level = leveler->updateLevel(samples, sum / 2, max);
 }
 
@@ -162,14 +162,14 @@ void PCM::addPCM16(const short PCMdata[2][512])
     float a, b, sum = 0, max = 0;
     for (size_t i = 0; i < samples; i++)
     {
-		size_t j=(i+start) % maxsamples;
+		size_t j=(i+start) % maxSamples;
         a=pcmL[j]=(PCMdata[0][i]/16384.0);
         b=pcmR[j]=(PCMdata[1][i]/16384.0);
         sum += std::abs(a) + std::abs(b);
         max = std::max(std::max(max, a), b);
     }
-	start = (start+samples) % maxsamples;
-    newsamples += samples;
+	start = (start+samples) % maxSamples;
+    newSamples += samples;
     level = leveler->updateLevel(samples, sum / 2, max);
 }
 
@@ -180,14 +180,14 @@ void PCM::addPCM8(const unsigned char PCMdata[2][1024])
     float a, b, sum = 0, max = 0;
     for (size_t i = 0; i < samples; i++)
     {
-        size_t j= (i+start) % maxsamples;
+        size_t j= (i+start) % maxSamples;
         a=pcmL[j]=(((float)PCMdata[0][i] - 128.0) / 64 );
         b=pcmR[j]=(((float)PCMdata[1][i] - 128.0) / 64 );
         sum += std::abs(a) + std::abs(b);
         max = std::max(std::max(max, a), b);
     }
-    start = (start + samples) % maxsamples;
-    newsamples += samples;
+    start = (start + samples) % maxSamples;
+    newSamples += samples;
     level = leveler->updateLevel(samples, sum / 2, max);
 }
 
@@ -198,14 +198,14 @@ void PCM::addPCM8_512(const unsigned char PCMdata[2][512])
     float a, b, sum = 0, max = 0;
     for (size_t i = 0; i < samples; i++)
     {
-        size_t j = (i+start) % maxsamples;
+        size_t j = (i+start) % maxSamples;
         a=pcmL[j]=(((float)PCMdata[0][i] - 128.0 ) / 64 );
         b=pcmR[j]=(((float)PCMdata[1][i] - 128.0 ) / 64 );
         sum += std::abs(a) + std::abs(b);
         max = std::max(std::max(max, a), b);
     }
-    start = (start + samples) % maxsamples;
-    newsamples += samples;
+    start = (start + samples) % maxSamples;
+    newSamples += samples;
     level = leveler->updateLevel(samples, sum / 2, max);
 }
 
@@ -333,11 +333,11 @@ void PCM::getSpectrum(float* data, CHANNEL channel, size_t samples, float smooth
 
 void PCM::_updateFFT()
 {
-    if (newsamples > 0)
+    if (newSamples > 0)
     {
         _updateFFT(0);
         _updateFFT(1);
-        newsamples = 0;
+        newSamples = 0;
     }
 }
 
@@ -369,13 +369,13 @@ inline double constrain(double a, double mn, double mx)
 void PCM::_copyPCM(float* to, int channel, size_t count)
 {
     assert(channel == 0 || channel == 1);
-    assert(count < maxsamples);
+    assert(count < maxSamples);
     auto const& from = channel==0 ? pcmL : pcmR;
     const double volume = 1.0 / level;
     for (size_t i = 0, pos = start; i < count; i++)
     {
         if (pos==0)
-            pos = maxsamples;
+            pos = maxSamples;
         to[i] = from[--pos] * volume;
     }
 }
@@ -388,7 +388,7 @@ void PCM::_copyPCM(double* to, int channel, size_t count)
     for (size_t i = 0, pos = start; i < count; i++)
     {
         if (pos==0)
-            pos = maxsamples;
+            pos = maxSamples;
         to[i] = from[--pos] * volume;
     }
 }
diff --git a/src/libprojectM/PCM.hpp b/src/libprojectM/PCM.hpp
index e798b20c2..2a91ef2e8 100755
--- a/src/libprojectM/PCM.hpp
+++ b/src/libprojectM/PCM.hpp
@@ -51,7 +51,7 @@ class PCM
 {
 public:
     /* maximum number of sound samples that are actually stored. */
-    static constexpr size_t maxsamples=2048;
+    static constexpr size_t maxSamples=2048;
 
     PCM();
     ~PCM();
@@ -88,10 +88,10 @@ private:
     // circular PCM buffer
     // adjust "volume" of PCM data as we go, this simplifies everything downstream...
     // normalize to range [-1.0,1.0]
-    std::array<float, maxsamples> pcmL{0.f};
-    std::array<float, maxsamples> pcmR{0.f};
+    std::array<float, maxSamples> pcmL{0.f};
+    std::array<float, maxSamples> pcmR{0.f};
     int start{0};
-    size_t newsamples{0};
+    size_t newSamples{0};
 
     // raw FFT data
     std::array<double, 2*FFT_LENGTH> freqL{0.0};
diff --git a/src/libprojectM/ProjectMCWrapper.cpp b/src/libprojectM/ProjectMCWrapper.cpp
index f12f8b7a8..03953abc8 100644
--- a/src/libprojectM/ProjectMCWrapper.cpp
+++ b/src/libprojectM/ProjectMCWrapper.cpp
@@ -729,7 +729,7 @@ bool projectm_get_error_loading_current_preset(projectm_handle instance)
 
 unsigned int projectm_pcm_get_max_samples()
 {
-    return PCM::maxsamples;
+    return PCM::maxSamples;
 }
 
 void projectm_pcm_add_float_1ch_data(projectm_handle instance, const float* pcm_data, unsigned int sample_count)