diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java
index 3cb749bcbbeb..386ec9b3bebb 100644
--- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/storage/ClasspathStorage.java
@@ -173,7 +173,7 @@ public class ClasspathStorage implements StateStorage {
   public ExternalizationSession startExternalization() {
     final ExternalizationSession session = new ExternalizationSession() {
       @Override
-      public void setState(@NotNull Object component, String componentName, @NotNull Object state, Storage storageSpec) {
+      public void setState(@NotNull Object component, @NotNull String componentName, @NotNull Object state, Storage storageSpec) {
         assert mySession == this;
         ClasspathStorage.this.setState(component, componentName, state);
       }
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java
index eb297b60d9b3..35115eeb0f5a 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java
@@ -286,7 +286,7 @@ public class DirectoryBasedStorage implements StateStorage, Disposable {
     }
 
     @Override
-    public void setState(@NotNull final Object component, final String componentName, @NotNull final Object state, final Storage storageSpec) {
+    public void setState(@NotNull Object component, @NotNull String componentName, @NotNull Object state, Storage storageSpec) {
       assert mySession == this;
       setState(componentName, state, storageSpec);
     }
diff --git a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/StorageData.java b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/StorageData.java
index 6f928f020348..22e3fc9d72e0 100644
--- a/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/StorageData.java
+++ b/platform/projectModel-impl/src/com/intellij/openapi/components/impl/stores/StorageData.java
@@ -141,7 +141,7 @@ public class StorageData {
     clearHash();
   }
 
-  void setState(@NotNull final String componentName, final Element element) {
+  void setState(@NotNull String componentName, @NotNull Element element) {
     element.setName(COMPONENT);
 
     // componentName should be first