diff --git a/packages/addons/games/sauerbraten/build b/packages/addons/games/sauerbraten/build
index d3addc461c..47c08c1134 100755
--- a/packages/addons/games/sauerbraten/build
+++ b/packages/addons/games/sauerbraten/build
@@ -12,7 +12,7 @@ $SCRIPTS/build SDL_image
 $SCRIPTS/build SDL_mixer
 $SCRIPTS/build Mesa
 
-ADDON_NAME="plugin.games.$1"
+ADDON_ID="addon.games.$1"
 ADDON_VERSION="1"
 
 PKG_DIR=`find $ROOT/$PACKAGES -type d -name $1`
@@ -29,16 +29,17 @@ make
 
 cd ..
 
-mkdir -p .addons/$ADDON_NAME
-  cp -R data .addons/$ADDON_NAME
-  cp -R packages .addons/$ADDON_NAME
-  cp *.cfg .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 .addons/$ADDON_ID
+  cp -R packages .addons/$ADDON_ID
+  cp *.cfg .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 src/sauer_client .addons/$ADDON_NAME/bin
-  cp src/sauer_server .addons/$ADDON_NAME/bin
+mkdir -p .addons/$ADDON_ID/bin
+  cp src/sauer_client .addons/$ADDON_ID/bin
+  cp src/sauer_server .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/sauerbraten/install b/packages/addons/games/sauerbraten/install
index d924e3b03b..f3f6cedb4c 100755
--- a/packages/addons/games/sauerbraten/install
+++ b/packages/addons/games/sauerbraten/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 $BUILD/$1/.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 $BUILD/$1/.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/sauerbraten/scripts/addon.xml b/packages/addons/games/sauerbraten/scripts/addon.xml
index 3bceb9a92e..a70c0f8384 100644
--- a/packages/addons/games/sauerbraten/scripts/addon.xml
+++ b/packages/addons/games/sauerbraten/scripts/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.games.sauerbraten"
+<addon id="@ADDON_ID@"
        name="(Game) Cube 2: Sauerbraten"
        version="@ADDON_VERSION@"
        provider-name="OpenELEC.tv">