diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java
index ad38938..c44293e 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/targetprep/DynamicConfigPusher.java
@@ -123,7 +123,8 @@
         }
 
         if (TestTarget.DEVICE.equals(mTarget)) {
-            String deviceDest = DynamicConfig.CONFIG_FOLDER_ON_DEVICE + hostFile.getName();
+            String deviceDest = String.format("%s%s.dynamic",
+                    DynamicConfig.CONFIG_FOLDER_ON_DEVICE, mModuleName);
             if (!device.pushFile(hostFile, deviceDest)) {
                 throw new TargetSetupError(String.format(
                         "Failed to push local '%s' to remote '%s'", hostFile.getAbsolutePath(),