diff --git a/packages/addons/games/wesnoth/build b/packages/addons/games/wesnoth/build
index 103bf0d007..91936c3c21 100755
--- a/packages/addons/games/wesnoth/build
+++ b/packages/addons/games/wesnoth/build
@@ -15,7 +15,7 @@ $SCRIPTS/build SDL_mixer
 $SCRIPTS/build SDL_net
 $SCRIPTS/build SDL_ttf
 
-ADDON_NAME="plugin.games.$1"
+ADDON_ID="addon.games.$1"
 ADDON_VERSION="1"
 
 PKG_DIR=`find $ROOT/$PACKAGES -type d -name $1`
@@ -34,14 +34,15 @@ make
 
 cd ..
 
-mkdir -p .addons/$ADDON_NAME
-  cp -R data fonts images sounds translations .addons/$ADDON_NAME
-  cp l10n-track .addons/$ADDON_NAME
-  cp -R $PKG_DIR/scripts/* .addons/$ADDON_NAME
-  $SED "s|@ADDON_VERSION@|$OS_VERSION.$ADDON_VERSION|g" -i .addons/$ADDON_NAME/addon.xml
+mkdir -p .addons/$ADDON_ID
+  cp -R data fonts images sounds translations .addons/$ADDON_ID
+  cp l10n-track .addons/$ADDON_ID
+  cp -R $PKG_DIR/scripts/* .addons/$ADDON_ID
+  $SED "s|@ADDON_VERSION@|$OS_VERSION.$ADDON_VERSION|g" -i .addons/$ADDON_ID/addon.xml
+  $SED "s|@ADDON_ID@|$ADDON_ID|g" -i .addons/$ADDON_ID/addon.xml
 
-mkdir -p .addons/$ADDON_NAME/bin
-  cp build/wesnoth .addons/$ADDON_NAME/bin
+mkdir -p .addons/$ADDON_ID/bin
+  cp build/wesnoth .addons/$ADDON_ID/bin
 
 cd .addons
-  zip -rq $ADDON_NAME-$OS_VERSION.$ADDON_VERSION.zip $ADDON_NAME
+  zip -rq $ADDON_ID-$OS_VERSION.$ADDON_VERSION.zip $ADDON_ID
diff --git a/packages/addons/games/wesnoth/install b/packages/addons/games/wesnoth/install
index 749f29fa75..0020e0dffd 100755
--- a/packages/addons/games/wesnoth/install
+++ b/packages/addons/games/wesnoth/install
@@ -2,14 +2,14 @@
 
 . config/options
 
-ADDON_NAME="plugin.games.$1"
+ADDON_ID="addon.games.$1"
 ADDON_VERSION="1"
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
 
 if [ "$2" = addons ]; then
-  mkdir -p $TARGET_ADDONS/$ADDON_NAME
-    cp $PKG_BUILD/.addons/$ADDON_NAME-$OS_VERSION.$ADDON_VERSION.zip $TARGET_ADDONS/$ADDON_NAME
-    cp $PKG_DIR/scripts/changelog.txt $TARGET_ADDONS/$ADDON_NAME/changelog-$OS_VERSION.$ADDON_VERSION.txt
-    cp $PKG_DIR/scripts/icon.png $TARGET_ADDONS/$ADDON_NAME/icon.png
+  mkdir -p $TARGET_ADDONS/$ADDON_ID
+    cp $PKG_BUILD/.addons/$ADDON_ID-$OS_VERSION.$ADDON_VERSION.zip $TARGET_ADDONS/$ADDON_ID
+    cp $PKG_DIR/scripts/changelog.txt $TARGET_ADDONS/$ADDON_ID/changelog-$OS_VERSION.$ADDON_VERSION.txt
+    cp $PKG_DIR/scripts/icon.png $TARGET_ADDONS/$ADDON_ID/icon.png
 fi
diff --git a/packages/addons/games/wesnoth/scripts/addon.xml b/packages/addons/games/wesnoth/scripts/addon.xml
index cabd2bb2d8..9a07d00f18 100644
--- a/packages/addons/games/wesnoth/scripts/addon.xml
+++ b/packages/addons/games/wesnoth/scripts/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.games.wesnoth"
+<addon id="@ADDON_ID@"
        name="(Game) The Battle for Wesnoth"
        version="@ADDON_VERSION@"
        provider-name="OpenELEC.tv">