diff --git a/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java b/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java
index e260248a5db3d6a2ca9b8ec85f54e56f3183b725..9648e9dc49eba7d6a4f11f5832582773f9f86c94 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/DataStructureV1_0.java
@@ -68,7 +68,7 @@ public class DataStructureV1_0 extends AbstractDataStructure
      * 
      * @throws UserFailureException if this method has been invoked before the format has been set.
      */
-    public IFormatedData getFormatedData()
+    public IFormattedData getFormatedData()
     {
         if (format == null)
         {
@@ -141,7 +141,7 @@ public class DataStructureV1_0 extends AbstractDataStructure
     {
         if (getOriginalData().iterator().hasNext() == false)
         {
-            throw new UserFailureException("Empty orginal data directory.");
+            throw new UserFailureException("Empty original data directory.");
         }
         IDirectory metaDataDirectory = getMetaDataDirectory();
         if (metaDataDirectory.tryToGetNode(Format.FORMAT_DIR) == null)
diff --git a/bds/source/java/ch/systemsx/cisd/bds/FormatedDataFactory.java b/bds/source/java/ch/systemsx/cisd/bds/FormatedDataFactory.java
index 707438aa69ae10220e3e346c2ce82d0ebda0764d..ef32a8a41ddff64805aa3005b7bb76a9770fa732 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/FormatedDataFactory.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/FormatedDataFactory.java
@@ -24,58 +24,58 @@ import ch.systemsx.cisd.common.exceptions.UserFailureException;
 
 
 /**
- * Factory for objects of type {@link IFormatedData}.
+ * Factory for objects of type {@link IFormattedData}.
  *
  * @author Franz-Josef Elmer
  */
 class FormatedDataFactory
 {
-    private static final Map<String, Factory<IFormatedData>> factories = new HashMap<String, Factory<IFormatedData>>();
+    private static final Map<String, Factory<IFormattedData>> factories = new HashMap<String, Factory<IFormattedData>>();
     
     static
     {
-        register(UnknownFormat1_0.UNKNOWN_1_0, NoFormatedData.class);
+        register(UnknownFormat1_0.UNKNOWN_1_0, NoFormattedData.class);
     }
     
-    static void register(Format format, Class<? extends IFormatedData> clazz)
+    static void register(Format format, Class<? extends IFormattedData> clazz)
     {
         String code = format.getCode();
-        Factory<IFormatedData> factory = factories.get(code);
+        Factory<IFormattedData> factory = factories.get(code);
         if (factory == null)
         {
-            factory = new Factory<IFormatedData>();
+            factory = new Factory<IFormattedData>();
             factories.put(code, factory);
         }
         factory.register(format.getVersion(), clazz);
     }
     
-    static Class<? extends IFormatedData> getFormatedDataInterfaceFor(Format format, Format defaultFormat)
+    static Class<? extends IFormattedData> getFormatedDataInterfaceFor(Format format, Format defaultFormat)
     {
-        Factory<IFormatedData> factory = getFactory(format, defaultFormat);
+        Factory<IFormattedData> factory = getFactory(format, defaultFormat);
         return factory.getClassFor(format.getVersion());
     }
 
-    static IFormatedData createFormatedData(IDirectory dataDirectory, Format format, Format defaultFormat)
+    static IFormattedData createFormatedData(IDirectory dataDirectory, Format format, Format defaultFormat)
     {
-        Factory<IFormatedData> factory = getFactory(format, defaultFormat);
+        Factory<IFormattedData> factory = getFactory(format, defaultFormat);
         return factory.create(IDirectory.class, dataDirectory, format.getVersion());
     }
 
-    private static Factory<IFormatedData> getFactory(Format format, Format defaultFormat)
+    private static Factory<IFormattedData> getFactory(Format format, Format defaultFormat)
     {
         assert format != null : "Unspecified format.";
         String code = format.getCode();
         assert code != null : "Unspecified format code.";
         assert format.getVersion() != null : "Unspecified version.";
         
-        Factory<IFormatedData> factory = factories.get(code);
+        Factory<IFormattedData> factory = factories.get(code);
         if (factory == null)
         {
             if (defaultFormat != null)
             {
                 return getFactory(defaultFormat, null);
             }
-            throw new UserFailureException("Unkown format code: " + code);
+            throw new UserFailureException("Unknown format code: " + code);
         }
         return factory;
     }
diff --git a/bds/source/java/ch/systemsx/cisd/bds/IFormatedData.java b/bds/source/java/ch/systemsx/cisd/bds/IFormattedData.java
similarity index 96%
rename from bds/source/java/ch/systemsx/cisd/bds/IFormatedData.java
rename to bds/source/java/ch/systemsx/cisd/bds/IFormattedData.java
index a029aeb633645864c7f1d8a8f467bb24d93e373c..fac447014768b62accc5c3e8914580cbf84a558d 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/IFormatedData.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/IFormattedData.java
@@ -21,7 +21,7 @@ package ch.systemsx.cisd.bds;
  *
  * @author Franz-Josef Elmer
  */
-public interface IFormatedData
+public interface IFormattedData
 {
     /**
      * Returns the format of data.
diff --git a/bds/source/java/ch/systemsx/cisd/bds/NoFormatedData.java b/bds/source/java/ch/systemsx/cisd/bds/NoFormattedData.java
similarity index 84%
rename from bds/source/java/ch/systemsx/cisd/bds/NoFormatedData.java
rename to bds/source/java/ch/systemsx/cisd/bds/NoFormattedData.java
index e5bf25a010f0ac656a8a535b59578d81269b4126..d6aca4ea084dcc05f6dc7ee9f1643897ef7201f9 100644
--- a/bds/source/java/ch/systemsx/cisd/bds/NoFormatedData.java
+++ b/bds/source/java/ch/systemsx/cisd/bds/NoFormattedData.java
@@ -19,12 +19,12 @@ package ch.systemsx.cisd.bds;
 import ch.systemsx.cisd.bds.storage.IDirectory;
 
 /**
- * Most simplest implementation of {@link IFormatedData}. It is associated with {@link UnknownFormat1_0}.
+ * Most simplest implementation of {@link IFormattedData}. It is associated with {@link UnknownFormat1_0}.
  * It can be subclassed provided {@link #getFormat()} will be overridden.
  *
  * @author Franz-Josef Elmer
  */
-public class NoFormatedData implements IFormatedData
+public class NoFormattedData implements IFormattedData
 {
     /**
      * Root directory of formated data.
@@ -34,7 +34,7 @@ public class NoFormatedData implements IFormatedData
     /**
      * Creates an instance for the specified data directory.
      */
-    public NoFormatedData(IDirectory dataDirectory)
+    public NoFormattedData(IDirectory dataDirectory)
     {
         this.dataDirectory = dataDirectory;
     }
diff --git a/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java b/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java
index 65987647074f8a9892a34f584716d65b14934af1..0b8f94bf2b741241947169b69a84a920b7276112 100644
--- a/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java
+++ b/bds/sourceTest/java/ch/systemsx/cisd/bds/DataStructureV1_0Test.java
@@ -70,8 +70,8 @@ public class DataStructureV1_0Test
     public void testGetFormatedData()
     {
         dataStructure.setFormat(UnknownFormat1_0.UNKNOWN_1_0);
-        IFormatedData formatedData = dataStructure.getFormatedData();
-        assertTrue(formatedData instanceof NoFormatedData);
+        IFormattedData formatedData = dataStructure.getFormatedData();
+        assertTrue(formatedData instanceof NoFormattedData);
         assertEquals(UnknownFormat1_0.UNKNOWN_1_0, formatedData.getFormat());
     }