diff --git a/docs/CMake API.md b/docs/CMake API.md
index f702294f8e..6880022dbf 100644
--- a/docs/CMake API.md	
+++ b/docs/CMake API.md	
@@ -380,6 +380,12 @@ attributes directly to these creation functions, rather than adding them later.
     plugins will only be enabled when building on macOS. It is an error to pass `AAX` or `VST`
     without first calling `juce_set_aax_sdk_path` or `juce_set_vst2_sdk_path` respectively.
 
+- `PLUGIN_NAME`
+  - The name of the plugin. In a DAW environment, this is the name that will be displayed to the
+    user when they go to load a plugin. This name may differ from the name of the physical plugin
+    file (to set the name of the plugin file, use the `PRODUCT_NAME` option). If not specified,
+    the `PLUGIN_NAME` will default to match the `PRODUCT_NAME`.
+
 - `PLUGIN_MANUFACTURER_CODE`
   - A four-character unique ID for your company. For AU compatibility, this must contain at least
     one upper-case letter.
diff --git a/extras/Build/CMake/JUCEUtils.cmake b/extras/Build/CMake/JUCEUtils.cmake
index b020ba740f..3536994dff 100644
--- a/extras/Build/CMake/JUCEUtils.cmake
+++ b/extras/Build/CMake/JUCEUtils.cmake
@@ -737,7 +737,7 @@ function(_juce_write_configure_time_info target)
     _juce_append_target_property(file_content PLUGIN_CODE                          ${target} JUCE_PLUGIN_CODE)
     _juce_append_target_property(file_content IPHONE_SCREEN_ORIENTATIONS           ${target} JUCE_IPHONE_SCREEN_ORIENTATIONS)
     _juce_append_target_property(file_content IPAD_SCREEN_ORIENTATIONS             ${target} JUCE_IPAD_SCREEN_ORIENTATIONS)
-    _juce_append_target_property(file_content PLUGIN_NAME                          ${target} JUCE_PRODUCT_NAME)
+    _juce_append_target_property(file_content PLUGIN_NAME                          ${target} JUCE_PLUGIN_NAME)
     _juce_append_target_property(file_content PLUGIN_MANUFACTURER                  ${target} JUCE_COMPANY_NAME)
     _juce_append_target_property(file_content PLUGIN_DESCRIPTION                   ${target} JUCE_DESCRIPTION)
     _juce_append_target_property(file_content PLUGIN_AU_EXPORT_PREFIX              ${target} JUCE_AU_EXPORT_PREFIX)
@@ -1195,7 +1195,7 @@ endfunction()
 function(_juce_add_unity_script_file shared_target out_var)
     set(script_in "${JUCE_CMAKE_UTILS_DIR}/UnityPluginGUIScript.cs.in")
 
-    get_target_property(plugin_name ${shared_target} JUCE_PRODUCT_NAME)
+    get_target_property(plugin_name ${shared_target} JUCE_PLUGIN_NAME)
     get_target_property(plugin_vendor ${shared_target} JUCE_COMPANY_NAME)
     get_target_property(plugin_description ${shared_target} JUCE_DESCRIPTION)
 
@@ -1533,7 +1533,7 @@ function(_juce_configure_plugin_targets target)
         JucePlugin_IsMidiEffect=$<BOOL:$<TARGET_PROPERTY:${target},JUCE_IS_MIDI_EFFECT>>
         JucePlugin_WantsMidiInput=$<BOOL:$<TARGET_PROPERTY:${target},JUCE_NEEDS_MIDI_INPUT>>
         JucePlugin_EditorRequiresKeyboardFocus=$<BOOL:$<TARGET_PROPERTY:${target},JUCE_EDITOR_WANTS_KEYBOARD_FOCUS>>
-        JucePlugin_Name="$<TARGET_PROPERTY:${target},JUCE_PRODUCT_NAME>"
+        JucePlugin_Name="$<TARGET_PROPERTY:${target},JUCE_PLUGIN_NAME>"
         JucePlugin_Desc="$<TARGET_PROPERTY:${target},JUCE_DESCRIPTION>"
         JucePlugin_Version=${project_version_string}
         JucePlugin_VersionString="${project_version_string}"
@@ -1640,6 +1640,7 @@ function(_juce_set_fallback_properties target)
 
     get_target_property(output_name ${target} JUCE_PRODUCT_NAME)
     _juce_set_property_if_not_set(${target} DESCRIPTION "${output_name}")
+    _juce_set_property_if_not_set(${target} PLUGIN_NAME "${output_name}")
 
     get_target_property(real_company_name ${target} JUCE_COMPANY_NAME)
     _juce_set_property_if_not_set(${target} BUNDLE_ID "com.${real_company_name}.${target}")
@@ -1861,6 +1862,7 @@ function(_juce_initialise_target target)
         APP_SANDBOX_ENABLED
         APP_SANDBOX_INHERIT
 
+        PLUGIN_NAME
         PLUGIN_MANUFACTURER_CODE
         PLUGIN_CODE
         DESCRIPTION