diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk
index 056c96a1..0a36014a 100644
--- a/Makefile.plugins.mk
+++ b/Makefile.plugins.mk
@@ -57,10 +57,10 @@ lv2        = $(TARGET_DIR)/$(NAME).lv2/$(NAME)$(LIB_EXT)
 lv2_dsp    = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_dsp$(LIB_EXT)
 lv2_ui     = $(TARGET_DIR)/$(NAME).lv2/$(NAME)_ui$(LIB_EXT)
 vst        = $(TARGET_DIR)/$(NAME)-vst$(LIB_EXT)
-au_plugin  = $(TARGET_DIR)/$(NAME).component/Contents/MacOS/dpfplugin
+au_plugin  = $(TARGET_DIR)/$(NAME).component/Contents/MacOS/$(NAME)
 au_pkginfo = $(TARGET_DIR)/$(NAME).component/Contents/PkgInfo
 au_plist   = $(TARGET_DIR)/$(NAME).component/Contents/Info.plist
-au_rsrc    = $(TARGET_DIR)/$(NAME).component/Contents/Resources/dpfplugin.rsrc
+au_rsrc    = $(TARGET_DIR)/$(NAME).component/Contents/Resources/$(NAME).rsrc
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Set stuff needed for AU
@@ -287,7 +287,7 @@ $(au_pkginfo): $(OBJS_DSP)
 $(au_plist): $(OBJS_DSP)
 	-@mkdir -p $(shell dirname $@)
 	@echo "Creating AU Info.plist for $(NAME)"
-	cp $(DPF_PATH)/distrho/src/CoreAudio106/Info.plist $@
+	sed -e "s/X-DPF-EXECUTABLE-DPF-X/$(NAME)/g" $(DPF_PATH)/distrho/src/CoreAudio106/Info.plist > $@
 
 $(au_rsrc): $(BUILD_DIR)/step2.rsrc
 	-@mkdir -p $(shell dirname $@)
diff --git a/distrho/src/CoreAudio106/Info.plist b/distrho/src/CoreAudio106/Info.plist
index 0e1a11a5..e0e7c89f 100755
--- a/distrho/src/CoreAudio106/Info.plist
+++ b/distrho/src/CoreAudio106/Info.plist
@@ -5,13 +5,13 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>dpfplugin</string>
+	<string>X-DPF-EXECUTABLE-DPF-X</string>
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
 	<string>com.yourcompany.dpfplugin</string>
 	<key>CFBundleName</key>
-	<string>dpfplugin</string>
+	<string>X-DPF-EXECUTABLE-DPF-X</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>