diff --git a/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp b/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp
index 62d942e0bd..2bcb8ba905 100644
--- a/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp
+++ b/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp
@@ -32,24 +32,24 @@ AudioProcessorValueTreeState::Parameter::Parameter (const String& parameterID,
                                                     const String& parameterName,
                                                     const String& labelText,
                                                     NormalisableRange<float> valueRange,
-                                                    float defaultValue,
+                                                    float defaultParameterValue,
                                                     std::function<String(float)> valueToTextFunction,
                                                     std::function<float(const String&)> textToValueFunction,
                                                     bool isMetaParameter,
                                                     bool isAutomatableParameter,
                                                     bool isDiscrete,
-                                                    AudioProcessorParameter::Category category,
+                                                    AudioProcessorParameter::Category parameterCategory,
                                                     bool isBoolean)
     : AudioParameterFloat (parameterID,
                            parameterName,
                            valueRange,
-                           defaultValue,
+                           defaultParameterValue,
                            labelText,
-                           category,
+                           parameterCategory,
                            valueToTextFunction == nullptr ? std::function<String(float v, int)>()
                                                           : [valueToTextFunction](float v, int) { return valueToTextFunction (v); },
                            std::move (textToValueFunction)),
-      unsnappedDefault (valueRange.convertTo0to1 (defaultValue)),
+      unsnappedDefault (valueRange.convertTo0to1 (defaultParameterValue)),
       metaParameter (isMetaParameter),
       automatable (isAutomatableParameter),
       discrete (isDiscrete),
diff --git a/modules/juce_audio_processors/utilities/juce_RangedAudioParameter.cpp b/modules/juce_audio_processors/utilities/juce_RangedAudioParameter.cpp
index 29c1b6053f..69b7522d57 100644
--- a/modules/juce_audio_processors/utilities/juce_RangedAudioParameter.cpp
+++ b/modules/juce_audio_processors/utilities/juce_RangedAudioParameter.cpp
@@ -28,10 +28,10 @@ namespace juce
 {
 
 RangedAudioParameter::RangedAudioParameter (const String& parameterID,
-                                            const String& name,
-                                            const String& label,
-                                            Category category)
-    : AudioProcessorParameterWithID (parameterID, name, label, category)
+                                            const String& parameterName,
+                                            const String& parameterLabel,
+                                            Category parameterCategory)
+    : AudioProcessorParameterWithID (parameterID, parameterName, parameterLabel, parameterCategory)
 {
 }
 
diff --git a/modules/juce_core/network/juce_NamedPipe.cpp b/modules/juce_core/network/juce_NamedPipe.cpp
index 356ff469a3..4333b80c11 100644
--- a/modules/juce_core/network/juce_NamedPipe.cpp
+++ b/modules/juce_core/network/juce_NamedPipe.cpp
@@ -198,9 +198,9 @@ private:
     //==============================================================================
     struct NamedPipeThread   : public Thread
     {
-        NamedPipeThread (const String& threadName, const String& pName,
+        NamedPipeThread (const String& tName, const String& pName,
                          bool shouldCreatePipe, WaitableEvent& completed)
-            : Thread (threadName), pipeName (pName), workCompleted (completed)
+            : Thread (tName), pipeName (pName), workCompleted (completed)
         {
             if (shouldCreatePipe)
                 pipe.createNewPipe (pipeName);
diff --git a/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp b/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp
index 4fbbafceea..ca32b00e74 100644
--- a/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp
+++ b/modules/juce_gui_basics/filebrowser/juce_FileChooserDialogBox.cpp
@@ -95,8 +95,8 @@ FileChooserDialogBox::FileChooserDialogBox (const String& name,
                                             FileBrowserComponent& chooserComponent,
                                             bool shouldWarn,
                                             Colour backgroundColour,
-                                            Component* parentComponent)
-    : ResizableWindow (name, backgroundColour, parentComponent == nullptr),
+                                            Component* parentComp)
+    : ResizableWindow (name, backgroundColour, parentComp == nullptr),
       warnAboutOverwritingExistingFiles (shouldWarn)
 {
     content = new ContentComponent (name, instructions, chooserComponent);
@@ -113,8 +113,8 @@ FileChooserDialogBox::FileChooserDialogBox (const String& name,
 
     FileChooserDialogBox::selectionChanged();
 
-    if (parentComponent != nullptr)
-        parentComponent->addAndMakeVisible (this);
+    if (parentComp != nullptr)
+        parentComp->addAndMakeVisible (this);
 }
 
 FileChooserDialogBox::~FileChooserDialogBox()
diff --git a/modules/juce_osc/osc/juce_OSCReceiver.cpp b/modules/juce_osc/osc/juce_OSCReceiver.cpp
index 180ea21a8e..a152ea1cf0 100644
--- a/modules/juce_osc/osc/juce_OSCReceiver.cpp
+++ b/modules/juce_osc/osc/juce_OSCReceiver.cpp
@@ -526,33 +526,33 @@ private:
     //==============================================================================
     void callListeners (const OSCBundle::Element& content)
     {
-        using Listener = OSCReceiver::Listener<OSCReceiver::MessageLoopCallback>;
+        using OSCListener = OSCReceiver::Listener<OSCReceiver::MessageLoopCallback>;
 
         if (content.isMessage())
         {
             auto&& message = content.getMessage();
-            listeners.call ([&] (Listener& l) { l.oscMessageReceived (message); });
+            listeners.call ([&] (OSCListener& l) { l.oscMessageReceived (message); });
         }
         else if (content.isBundle())
         {
             auto&& bundle = content.getBundle();
-            listeners.call ([&] (Listener& l) { l.oscBundleReceived (bundle); });
+            listeners.call ([&] (OSCListener& l) { l.oscBundleReceived (bundle); });
         }
     }
 
     void callRealtimeListeners (const OSCBundle::Element& content)
     {
-        using Listener = OSCReceiver::Listener<OSCReceiver::RealtimeCallback>;
+        using OSCListener = OSCReceiver::Listener<OSCReceiver::RealtimeCallback>;
 
         if (content.isMessage())
         {
             auto&& message = content.getMessage();
-            realtimeListeners.call ([&] (Listener& l) { l.oscMessageReceived (message); });
+            realtimeListeners.call ([&] (OSCListener& l) { l.oscMessageReceived (message); });
         }
         else if (content.isBundle())
         {
             auto&& bundle = content.getBundle();
-            realtimeListeners.call ([&] (Listener& l) { l.oscBundleReceived (bundle); });
+            realtimeListeners.call ([&] (OSCListener& l) { l.oscBundleReceived (bundle); });
         }
     }