diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/Changes_sl_mbedtls.txt b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/Changes_sl_mbedtls.txt
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/Changes_sl_mbedtls.txt
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/Changes_sl_mbedtls.txt
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/README.txt b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/README.txt
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/README.txt
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/README.txt
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/.gitignore b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/.gitignore
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/.gitignore
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/.gitignore
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/aes_alt.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/aes_alt.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/aes_alt.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/aes_alt.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/aesdrv.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/aesdrv.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/aesdrv.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/aesdrv.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/ccm_alt.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/ccm_alt.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/ccm_alt.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/ccm_alt.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/cmac.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/cmac.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/cmac.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/cmac.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/cmac_alt.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/cmac_alt.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/cmac_alt.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/cmac_alt.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/cryptodrv.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/cryptodrv.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/cryptodrv.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/cryptodrv.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/ecode.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/ecode.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/ecode.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/ecode.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/ecp_alt.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/ecp_alt.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/ecp_alt.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/ecp_alt.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/mbedtls_ecode.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/mbedtls_ecode.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/mbedtls_ecode.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/mbedtls_ecode.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/sha1_alt.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/sha1_alt.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/sha1_alt.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/sha1_alt.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/sha256_alt.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/sha256_alt.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/sha256_alt.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/sha256_alt.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/sl_crypto.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/sl_crypto.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/sl_crypto.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/sl_crypto.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/timing_alt.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/timing_alt.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/include/timing_alt.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/include/timing_alt.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/.gitignore b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/.gitignore
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/.gitignore
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/.gitignore
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_authencr.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_authencr.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_authencr.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_authencr.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_authencr_aes.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_authencr_aes.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_authencr_aes.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_authencr_aes.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_authencr_crypto.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_authencr_crypto.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_authencr_crypto.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_authencr_crypto.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_blockcipher_aes.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_blockcipher_aes.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_blockcipher_aes.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_blockcipher_aes.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_blockcipher_crypto.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_blockcipher_crypto.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_blockcipher_crypto.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_blockcipher_crypto.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_common.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_common.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_common.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_common.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_common_aes.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_common_aes.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_common_aes.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_common_aes.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_common_aes.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_common_aes.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_common_aes.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_common_aes.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_common_crypto.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_common_crypto.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_common_crypto.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_common_crypto.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_common_crypto.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_common_crypto.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_common_crypto.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_common_crypto.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_internal.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_internal.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/aesdrv_internal.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/aesdrv_internal.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/cryptodrv.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/cryptodrv.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/cryptodrv.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/cryptodrv.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/cryptodrv_internal.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/cryptodrv_internal.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/cryptodrv_internal.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/cryptodrv_internal.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/em_bufc.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/em_bufc.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/em_bufc.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/em_bufc.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/em_bufc.h b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/em_bufc.h
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/em_bufc.h
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/em_bufc.h
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/sl_aes.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/sl_aes.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/sl_aes.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/sl_aes.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/sl_ecp.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/sl_ecp.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/sl_ecp.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/sl_ecp.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/sl_sha1.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/sl_sha1.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/sl_sha1.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/sl_sha1.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/sl_sha256.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/sl_sha256.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/sl_sha256.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/sl_sha256.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/sl_timing.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/sl_timing.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/sl_timing.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/sl_timing.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/slcl_aes.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/slcl_aes.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/slcl_aes.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/slcl_aes.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/slcl_ccm.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/slcl_ccm.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/slcl_ccm.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/slcl_ccm.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/slcl_cmac.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/slcl_cmac.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/slcl_cmac.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/slcl_cmac.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/slcl_ecp.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/slcl_ecp.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/slcl_ecp.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/slcl_ecp.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/slcl_sha1.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/slcl_sha1.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/slcl_sha1.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/slcl_sha1.c
diff --git a/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/slcl_sha256.c b/targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/slcl_sha256.c
similarity index 100%
rename from targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/src/slcl_sha256.c
rename to targets/TARGET_Silicon_Labs/TARGET_EFM32/sl_crypto/TARGET_EFR32/src/slcl_sha256.c
diff --git a/targets/targets.json b/targets/targets.json
index 9f2faedca0..9335d285b2 100644
--- a/targets/targets.json
+++ b/targets/targets.json
@@ -2192,7 +2192,7 @@
     },
     "EFR32MG1P132f256GM48": {
         "inherits": ["EFM32"],
-        "extra_labels_add": ["EFR32MG1", "256K", "SL_RAIL"],
+        "extra_labels_add": ["EFR32", "EFR32MG1", "256K", "SL_RAIL"],
         "core": "Cortex-M4F",
         "macros": ["EFR32MG1P132f256GM48", "TRANSACTION_QUEUE_SIZE_SPI=4"],
         "supported_toolchains": ["GCC_ARM", "ARM", "uARM", "IAR"],
@@ -2202,7 +2202,7 @@
     },
     "EFR32MG1P233F256GM48": {
         "inherits": ["EFM32"],
-        "extra_labels_add": ["EFR32MG1", "256K", "SL_RAIL"],
+        "extra_labels_add": ["EFR32", "EFR32MG1", "256K", "SL_RAIL"],
         "core": "Cortex-M4F",
         "macros": ["EFR32MG1P233F256GM48", "TRANSACTION_QUEUE_SIZE_SPI=4"],
         "supported_toolchains": ["GCC_ARM", "ARM", "uARM", "IAR"],