diff --git a/VersionNum b/VersionNum
index 1a8df709e4df4383fa41d06fb83efee97827f066..a240a94466092ad8ac6f2a5aaf43bce2efccc388 100644
--- a/VersionNum
+++ b/VersionNum
@@ -1,23 +1,23 @@
-/* (0.99)
+/* (1.00)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  * Last processed by srccommit version: 1.1.
  *
  */
-#define Module_MajorVersion_CMHG        0.99
+#define Module_MajorVersion_CMHG        1.00
 #define Module_MinorVersion_CMHG        
-#define Module_Date_CMHG                30 Oct 2014
+#define Module_Date_CMHG                06 Dec 2014
 
-#define Module_MajorVersion             "0.99"
-#define Module_Version                  99
+#define Module_MajorVersion             "1.00"
+#define Module_Version                  100
 #define Module_MinorVersion             ""
-#define Module_Date                     "30 Oct 2014"
+#define Module_Date                     "06 Dec 2014"
 
-#define Module_ApplicationDate          "30-Oct-14"
+#define Module_ApplicationDate          "06-Dec-14"
 
 #define Module_ComponentName            "OMAP3"
 #define Module_ComponentPath            "castle/RiscOS/Sources/HAL/OMAP3"
 
-#define Module_FullVersion              "0.99"
-#define Module_HelpVersion              "0.99 (30 Oct 2014)"
-#define Module_LibraryVersionInfo       "0:99"
+#define Module_FullVersion              "1.00"
+#define Module_HelpVersion              "1.00 (06 Dec 2014)"
+#define Module_LibraryVersionInfo       "1:0"
diff --git a/s/CPUClk b/s/CPUClk
index d3d78f6d76a96fb6b22d93c5c8f86d5f33dc3ecd..15670142bf52db5608b05447f2d9ccf0eae584c5 100644
--- a/s/CPUClk
+++ b/s/CPUClk
@@ -226,7 +226,7 @@ CPUList
 CPUClkDevTemplate
         DCW     HALDeviceType_SysPeri + HALDeviceSysPeri_CPUClk
         DCW     HALDeviceID_CPUClk_OMAP3
-        DCD     HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L4
+        DCD     HALDeviceBus_Peri + HALDevicePeriBus_Sonics3220
         DCD     0                     ; API version
         DCD     CPUClk_Desc           ; Description
         DCD     0                     ; Address - unused
diff --git a/s/GPIO b/s/GPIO
index 8150357031ec03d10753cbae69da11a9048fddcb..5ad33fb7454ce086ee70b6864a73f16432011ea9 100644
--- a/s/GPIO
+++ b/s/GPIO
@@ -273,7 +273,7 @@ GPIO_InitDevice
 GPIOTemplate
         DCW     HALDeviceType_Comms + HALDeviceComms_GPIO
         DCW     HALDeviceID_GPIO_OMAP3
-        DCD     HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L4
+        DCD     HALDeviceBus_Peri + HALDevicePeriBus_Sonics3220
         DCD     0               ; API version
         DCD     GPIODesc        ; Description
         DCD     0               ; Address (none)
diff --git a/s/NIC b/s/NIC
index bae7506b12f823f435a35f5e9c8794da52663b36..7f5bcf103ea801cf73e970809722a62aa34831ec 100644
--- a/s/NIC
+++ b/s/NIC
@@ -92,7 +92,7 @@ NIC_GPMC_Config_DevKit
 NIC_SMSC
         DCW     HALDeviceType_Comms + HALDeviceComms_EtherNIC
         DCW     HALDeviceID_EtherNIC_SMSC9221
-        DCD     HALDeviceBus_Peri + HALDevicePeriBus_GPMC
+        DCD     HALDeviceBus_Exp + HALDeviceExpBus_GPMC
         DCD     0               ; API version
         DCD     SMSCDesc        ; Description
         DCD     0               ; Address - filled in later
@@ -115,7 +115,7 @@ NIC_SMSC
 NIC_DM9000
         DCW     HALDeviceType_Comms + HALDeviceComms_EtherNIC
         DCW     HALDeviceID_EtherNIC_DM9000
-        DCD     HALDeviceBus_Peri + HALDevicePeriBus_GPMC
+        DCD     HALDeviceBus_Exp + HALDeviceExpBus_GPMC
         DCD     0               ; API version
         DCD     DM9000Desc      ; Description
         DCD     0               ; Address - filled in later
diff --git a/s/SDIO b/s/SDIO
index 4497303c808c2f75d40f1e119a31ea2ec285bf85..2a23271c16f420800747d14486901e3c406c0170 100644
--- a/s/SDIO
+++ b/s/SDIO
@@ -300,7 +300,7 @@ Template
 0
         HALDeviceField Type,               HALDeviceType_ExpCtl + HALDeviceExpCtl_SDIO
         HALDeviceField ID,                 HALDeviceID_SDIO_SDHCI
-        HALDeviceField Location,           HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L4
+        HALDeviceField Location,           HALDeviceBus_Peri + HALDevicePeriBus_Sonics3220
         HALDeviceField Version,            0
         HALDeviceField Description
         HALDeviceField Address,            0 ; patched up at initialisation
diff --git a/s/SDMA b/s/SDMA
index a30940671780770e66c6c758b341165154630240..0f7ceb5023075f7a0a2ce07af870abc465e6e14c 100644
--- a/s/SDMA
+++ b/s/SDMA
@@ -193,7 +193,7 @@ SDMA_Init
 ControllerTemplate
         DCW     HALDeviceType_SysPeri + HALDeviceSysPeri_DMAC
         DCW     HALDeviceID_DMAC_OMAP3
-        DCD     HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L3
+        DCD     HALDeviceBus_Sys + HALDeviceSysBus_SonicsMX
         DCD     &10000          ; API version - 1.0
         DCD     SDMACDesc
         DCD     0               ; Address - N/A
@@ -225,7 +225,7 @@ ChannelTemplate
         ; Public interface
         DCW     HALDeviceType_SysPeri + HALDeviceSysPeri_DMAB
         DCW     HALDeviceID_DMAB_OMAP3
-        DCD     HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L3
+        DCD     HALDeviceBus_Sys + HALDeviceSysBus_SonicsMX
         DCD     &10000          ; API version - 1.0
         DCD     0               ; Description
         DCD     0               ; Address - N/A
diff --git a/s/SR37x b/s/SR37x
index a8a4a90bc2b1b532008ed73404b6892d0c8729ee..dc571ab4bd1282afe37a8a5874dcf3beeda9823c 100644
--- a/s/SR37x
+++ b/s/SR37x
@@ -529,7 +529,7 @@ End_SR37x_OPPTbl_AMDM37x_VDD2
 SR37xDevTemplate
         DCW     HALDeviceType_SysPeri + HALDeviceSysPeri_CPUClk
         DCW     HALDeviceID_CPUClk_AMDM37x_SR
-        DCD     HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L4
+        DCD     HALDeviceBus_Peri + HALDevicePeriBus_Sonics3220
         DCD     0                     ; API version
         DCD     SR37x_Desc            ; Description
         DCD     0                     ; Address - unused
diff --git a/s/Video b/s/Video
index 4b86f0ebbc3ce240e67167a69568e8061505c6c7..490d2a75ec3ca25d800ca62a0aa85648cfcf578e 100644
--- a/s/Video
+++ b/s/Video
@@ -112,7 +112,7 @@ VideoDevice_Init
 VideoDeviceTemplate
         DCW     HALDeviceType_Video + HALDeviceVideo_VDU
         DCW     HALDeviceID_VDU_OMAP3
-        DCD     HALDeviceBus_Interconnect + HALDeviceInterconnectBus_L3
+        DCD     HALDeviceBus_Sys + HALDeviceSysBus_SonicsMX
         DCD     0               ; API version 0
         DCD     VideoDevice_Desc
         DCD     0               ; Address - filled in later