diff --git a/ccm-cms/src/com/arsdigita/cms/util/ContentItemNameFix.java b/ccm-cms/src/com/arsdigita/cms/util/ContentItemNameFix.java
new file mode 100644
index 000000000..a9f966559
--- /dev/null
+++ b/ccm-cms/src/com/arsdigita/cms/util/ContentItemNameFix.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) 2004 Red Hat Inc. All Rights Reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+package com.arsdigita.cms.util;
+
+import com.arsdigita.cms.ContentBundle;
+import com.arsdigita.cms.ContentItem;
+import com.arsdigita.cms.ItemCollection;
+import com.arsdigita.kernel.Kernel;
+import com.arsdigita.kernel.KernelExcursion;
+import com.arsdigita.persistence.DataCollection;
+import com.arsdigita.persistence.DataObject;
+import com.arsdigita.persistence.Session;
+import com.arsdigita.persistence.SessionManager;
+import com.arsdigita.persistence.TransactionContext;
+import com.arsdigita.util.cmd.Program;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.OptionBuilder;
+
+/**
+ *
+ * @author Jens Pelzetter
+ */
+@SuppressWarnings("PMD.SystemPrintln")
+public class ContentItemNameFix extends Program {
+
+    private boolean pretend = false;
+
+    public ContentItemNameFix() {
+        super("ContentItemNameFix", "1.0.0", "");
+
+        getOptions().addOption(
+            OptionBuilder
+            .hasArg(false)
+            .withLongOpt("pretend")
+            .withDescription("Only show what would be done")
+            .create("p"));
+    }
+
+    public static final void main(final String[] args) {
+        new ContentItemNameFix().run(args);
+    }
+
+    @Override
+    protected void doRun(final CommandLine cmdLine) {
+
+        System.out.printf("Running ContentItemNameFix...\n");
+
+        pretend = cmdLine.hasOption("p");
+
+        if (pretend) {
+            System.out.printf("Pretend option is on, only showing what would be done...\n");
+        }
+
+        new KernelExcursion() {
+
+            @Override
+            protected void excurse() {
+                setEffectiveParty(Kernel.getSystemParty());
+
+                final Session session = SessionManager.getSession();
+                final TransactionContext transactionContext = session.getTransactionContext();
+
+                transactionContext.beginTxn();
+
+                final DataCollection draftBundles = session.retrieve(
+                    ContentBundle.BASE_DATA_OBJECT_TYPE);
+                draftBundles.addEqualsFilter(ContentItem.VERSION, "draft");
+
+                while (draftBundles.next()) {
+                    checkDraftBundle(draftBundles.getDataObject());
+
+                }
+
+                transactionContext.commitTxn();
+
+            }
+
+        }.run();
+
+    }
+
+    private void checkDraftBundle(final DataObject bundleObj) {
+
+        final ContentBundle draftBundle = new ContentBundle(bundleObj);
+        final ContentItem primaryDraftItem = draftBundle.getPrimaryInstance();
+
+       //This is our reference, all bundles, instances etc belonging to the item sould have this 
+        //name
+        final String itemName = primaryDraftItem.getName();
+
+        if (!draftBundle.getName().equals(itemName)) {
+            System.out.printf(
+                "ContentBundle %s for item %s has wrong name. Should be '%s' but is '%s'.",
+                draftBundle.getID().toString(),
+                primaryDraftItem.getID().toString(),
+                itemName,
+                draftBundle.getName());
+            if (!pretend) {
+                draftBundle.setName(itemName);
+                System.out.printf(" Corrected.\n");
+            }
+        }
+
+        checkInstances(draftBundle, itemName);
+
+        final ContentBundle liveBundle = (ContentBundle) draftBundle.getLiveVersion();
+        if (liveBundle != null) {
+            if (!liveBundle.getName().equals(itemName)) {
+                System.out.printf(
+                    "Live ContentBundle '%s' has wrong name. Should be '%s' but is '%s'",
+                    liveBundle.getID().toString(),
+                    itemName,
+                    liveBundle.getName());
+
+                if (!pretend) {
+                    liveBundle.setName(itemName);
+                    System.out.printf(" Corrected.\n");
+                }
+            }
+        }
+
+        checkInstances(liveBundle, itemName);
+
+    }
+
+    private void checkInstances(final ContentBundle draftBundle, final String itemName) {
+        final ItemCollection instances = draftBundle.getInstances();
+        ContentItem current;
+        while (instances.next()) {
+            current = instances.getContentItem();
+
+            if (!itemName.equals(current.getName())) {
+                System.out.printf("Item %s has wrong name. Should be '%s', but is '%s'.",
+                                  current.getID().toString(),
+                                  itemName,
+                                  current.getName());
+                if (!pretend) {
+                    current.setName(itemName);
+                    System.out.printf(" Corrected.\n");
+                }
+            }
+        }
+
+    }
+
+}