diff --git a/library/source/f4/stm32-f407-exti.ads b/library/source/f4/stm32-f407-exti.ads
index e7f3ee8..827d5c3 100644
--- a/library/source/f4/stm32-f407-exti.ads
+++ b/library/source/f4/stm32-f407-exti.ads
@@ -4,9 +4,9 @@ with STM32.EXTI;
 
 package STM32.F407.EXTI is
 
-	package Base renames STM32.EXTI;
+	package EXTI_Base renames STM32.EXTI;
 
-	EXTI_HW : Base.EXTI_Registers with Volatile, Import,
+	EXTI_HW : EXTI_Base.EXTI_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address (STM32.Address_Map.EXTI);
 
 end STM32.F407.EXTI;
\ No newline at end of file
diff --git a/library/source/f4/stm32-f407-spi.ads b/library/source/f4/stm32-f407-spi.ads
index 8c6d4a3..75beab3 100644
--- a/library/source/f4/stm32-f407-spi.ads
+++ b/library/source/f4/stm32-f407-spi.ads
@@ -6,13 +6,13 @@ package STM32.F407.SPI is
 
 	package Base renames STM32.SPI;
 
-	SPI1 : Base.SPI_Registers with Volatile, Import,
+	SPI1 : aliased Base.SPI_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address (STM32.Address_Map.SPI1);
 
-	SPI2 : Base.SPI_Registers with Volatile, Import,
+	SPI2 : aliased Base.SPI_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address (STM32.Address_Map.SPI2_I2S2);
 
-	SPI3 : Base.SPI_Registers with Volatile, Import,
+	SPI3 : aliased Base.SPI_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address (STM32.Address_Map.SPI3_I2S3);
 
 end STM32.F407.SPI;
diff --git a/library/source/f4/stm32-f407-syscfg.ads b/library/source/f4/stm32-f407-syscfg.ads
index 8f4d4f8..ac7e93d 100644
--- a/library/source/f4/stm32-f407-syscfg.ads
+++ b/library/source/f4/stm32-f407-syscfg.ads
@@ -4,9 +4,9 @@ with STM32.SYSCFG;
 
 package STM32.F407.SYSCFG is
 
-	package Base renames STM32.SYSCFG;
+	package SYSCFG_Base renames STM32.SYSCFG;
 
-	SYSCFG_HW : Base.SYSCFG_Registers with Volatile, Import,
+	SYSCFG_HW : SYSCFG_Base.SYSCFG_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address (STM32.Address_Map.SYSCFG);
 
 end STM32.F407.SYSCFG;
\ No newline at end of file
diff --git a/library/source/f4/stm32-f407-usart.ads b/library/source/f4/stm32-f407-usart.ads
index 7a4a8e8..c5e39ae 100644
--- a/library/source/f4/stm32-f407-usart.ads
+++ b/library/source/f4/stm32-f407-usart.ads
@@ -6,22 +6,22 @@ package STM32.F407.USART is
 
 	package Base renames STM32.USART;
 
-	USART1: Base.USART_Registers with Volatile, Import,
+	USART1: aliased Base.USART_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address(Address_Map.USART1);
 
-	USART2: Base.USART_Registers with Volatile, Import,
+	USART2: aliased Base.USART_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address(Address_Map.USART2);
 
-	USART3: Base.USART_Registers with Volatile, Import,
+	USART3: aliased Base.USART_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address(Address_Map.USART3);
 
-	UART4: Base.USART_Registers with Volatile, Import,
+	UART4: aliased Base.USART_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address(Address_Map.UART4);
 
-	UART5: Base.USART_Registers with Volatile, Import,
+	UART5: aliased Base.USART_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address(Address_Map.UART5);
 
-	USART6: Base.USART_Registers with Volatile, Import,
+	USART6: aliased Base.USART_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address(Address_Map.USART6);
 
 end STM32.F407.USART;
diff --git a/library/source/f4/stm32-f429-usart.ads b/library/source/f4/stm32-f429-usart.ads
index 0789661..25bae7c 100644
--- a/library/source/f4/stm32-f429-usart.ads
+++ b/library/source/f4/stm32-f429-usart.ads
@@ -6,28 +6,28 @@ package STM32.F429.USART is
 
 	package Base renames STM32.USART;
 
-	USART1: Base.USART_Registers with Volatile, Import,
+	USART1: aliased Base.USART_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address(Address_Map.USART1);
 
-	USART2: Base.USART_Registers with Volatile, Import,
+	USART2: aliased Base.USART_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address(Address_Map.USART2);
 
-	USART3: Base.USART_Registers with Volatile, Import,
+	USART3: aliased Base.USART_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address(Address_Map.USART3);
 
-	UART4: Base.USART_Registers with Volatile, Import,
+	UART4: aliased Base.USART_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address(Address_Map.UART4);
 
-	UART5: Base.USART_Registers with Volatile, Import,
+	UART5: aliased Base.USART_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address(Address_Map.UART5);
 
-	USART6: Base.USART_Registers with Volatile, Import,
+	USART6: aliased Base.USART_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address(Address_Map.USART6);
 
-	UART7: Base.USART_Registers with Volatile, Import,
+	UART7: aliased Base.USART_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address(Address_Map.UART7);
 
-	UART8: Base.USART_Registers with Volatile, Import,
+	UART8: aliased Base.USART_Registers with Volatile, Import,
 	Address => System.Storage_Elements.To_Address(Address_Map.UART8);
 
 end STM32.F429.USART;