diff --git a/.idea/modules.xml b/.idea/modules.xml
index 1112fc001876..ef9a08f236cc 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -662,7 +662,7 @@
       <module fileurl="file://$PROJECT_DIR$/platform/smRunner/intellij.platform.smRunner.iml" filepath="$PROJECT_DIR$/platform/smRunner/intellij.platform.smRunner.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/statistics/intellij.platform.statistics.iml" filepath="$PROJECT_DIR$/platform/statistics/intellij.platform.statistics.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/statistics/devkit/intellij.platform.statistics.devkit.iml" filepath="$PROJECT_DIR$/platform/statistics/devkit/intellij.platform.statistics.devkit.iml" />
-      <module fileurl="file://$PROJECT_DIR$/platform/statistics/sender/intellij.platform.statistics.sender.iml" filepath="$PROJECT_DIR$/platform/statistics/sender/intellij.platform.statistics.sender.iml" />
+      <module fileurl="file://$PROJECT_DIR$/platform/statistics/uploader/intellij.platform.statistics.uploader.iml" filepath="$PROJECT_DIR$/platform/statistics/uploader/intellij.platform.statistics.uploader.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/structuralsearch/intellij.platform.structuralSearch.iml" filepath="$PROJECT_DIR$/platform/structuralsearch/intellij.platform.structuralSearch.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml" filepath="$PROJECT_DIR$/platform/structuralsearch/intellij.platform.structuralSearch.tests.iml" />
       <module fileurl="file://$PROJECT_DIR$/platform/structure-view-impl/intellij.platform.structureView.impl.iml" filepath="$PROJECT_DIR$/platform/structure-view-impl/intellij.platform.structureView.impl.iml" />
diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
index 56bd071d6d8d..482e51ef58f8 100644
--- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
+++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/impl/DistributionJARsBuilder.groovy
@@ -144,7 +144,7 @@ class DistributionJARsBuilder {
       withModule("intellij.spellchecker")
       withModule("intellij.platform.images")
       withModule("intellij.platform.statistics")
-      withModule("intellij.platform.statistics.sender")
+      withModule("intellij.platform.statistics.uploader")
       withModule("intellij.platform.statistics.devkit")
 
       withModule("intellij.relaxng", "intellij-xml.jar")
diff --git a/platform/statistics/intellij.platform.statistics.iml b/platform/statistics/intellij.platform.statistics.iml
index e8e0a355e00f..fc8a4f60a7b4 100644
--- a/platform/statistics/intellij.platform.statistics.iml
+++ b/platform/statistics/intellij.platform.statistics.iml
@@ -15,6 +15,6 @@
     <orderEntry type="library" name="JDOM" level="project" />
     <orderEntry type="library" name="Guava" level="project" />
     <orderEntry type="module" module-name="intellij.platform.ide" />
-    <orderEntry type="module" module-name="intellij.platform.statistics.sender" exported="" />
+    <orderEntry type="module" module-name="intellij.platform.statistics.uploader" exported="" />
   </component>
 </module>
\ No newline at end of file
diff --git a/platform/statistics/sender/intellij.platform.statistics.sender.iml b/platform/statistics/uploader/intellij.platform.statistics.uploader.iml
similarity index 100%
rename from platform/statistics/sender/intellij.platform.statistics.sender.iml
rename to platform/statistics/uploader/intellij.platform.statistics.uploader.iml
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/connect/SettingsConnectionService.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/connect/SettingsConnectionService.java
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/connect/SettingsConnectionService.java
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/connect/SettingsConnectionService.java
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/connect/StatServiceException.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/connect/StatServiceException.java
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/connect/StatServiceException.java
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/connect/StatServiceException.java
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/connect/StatisticsResult.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/connect/StatisticsResult.java
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/connect/StatisticsResult.java
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/connect/StatisticsResult.java
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/connect/StatisticsService.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/connect/StatisticsService.java
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/connect/StatisticsService.java
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/connect/StatisticsService.java
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/DeviceConfiguration.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/DeviceConfiguration.java
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/DeviceConfiguration.java
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/DeviceConfiguration.java
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogApplication.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogApplication.java
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogApplication.java
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogApplication.java
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogBuildType.kt b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogBuildType.kt
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogBuildType.kt
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogBuildType.kt
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogFile.kt b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogFile.kt
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogFile.kt
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogFile.kt
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogFilesProvider.kt b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogFilesProvider.kt
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogFilesProvider.kt
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogFilesProvider.kt
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogResultDecorator.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogResultDecorator.java
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogResultDecorator.java
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogResultDecorator.java
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogSettingsService.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogSettingsService.java
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogSettingsService.java
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogSettingsService.java
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogStatisticsService.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogStatisticsService.java
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogStatisticsService.java
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogStatisticsService.java
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogUploadSettingsService.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogUploadSettingsService.java
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/EventLogUploadSettingsService.java
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/EventLogUploadSettingsService.java
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/LogEventFilter.kt b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/LogEventFilter.kt
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/LogEventFilter.kt
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/LogEventFilter.kt
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/LogEventRecordRequest.kt b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/LogEventRecordRequest.kt
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/LogEventRecordRequest.kt
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/LogEventRecordRequest.kt
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/LogEventSerializer.kt b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/LogEventSerializer.kt
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/LogEventSerializer.kt
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/LogEventSerializer.kt
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/LogEvents.kt b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/LogEvents.kt
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/LogEvents.kt
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/LogEvents.kt
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/StatisticsEventEscaper.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/StatisticsEventEscaper.java
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/eventLog/StatisticsEventEscaper.java
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/eventLog/StatisticsEventEscaper.java
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/service/fus/FUSWhitelist.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/service/fus/FUSWhitelist.java
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/service/fus/FUSWhitelist.java
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/service/fus/FUSWhitelist.java
diff --git a/platform/statistics/sender/src/com/intellij/internal/statistic/service/fus/FUStatisticsWhiteListGroupsService.java b/platform/statistics/uploader/src/com/intellij/internal/statistic/service/fus/FUStatisticsWhiteListGroupsService.java
similarity index 100%
rename from platform/statistics/sender/src/com/intellij/internal/statistic/service/fus/FUStatisticsWhiteListGroupsService.java
rename to platform/statistics/uploader/src/com/intellij/internal/statistic/service/fus/FUStatisticsWhiteListGroupsService.java