diff --git a/ChangeLog b/ChangeLog
index 36e560c1728..7712850411a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -11439,4 +11439,9 @@
 	  raw I2C data transfers for test applications (2016-02-02).
 	* I2C_RESET:  Eliminate up_i2creset().  It should not be a global function;
 	  Now it is an I2C interface method (2016-02-02).
+	* I2C: Rename up_i2cinitialize and up_i2cuninitilize to follow the correct
+	  naming convention.  These are not common interfaces used by the OS;
+	  these are MCU-specific interfaces used only be MCU-specific code.  The
+	  the correct naming is xyz_i2cbus_initialize and xzy_i2cbus_uninitialize
+	  where xzy is the MCU mnemonic (2016-02-02).
 
diff --git a/arch b/arch
index 263fa48aae0..403b4e70ebb 160000
--- a/arch
+++ b/arch
@@ -1 +1 @@
-Subproject commit 263fa48aae03da290b64ee43a31e321722e32ee1
+Subproject commit 403b4e70ebbca5c938ed0bd4531a0972ec736c7e
diff --git a/configs b/configs
index 58881115264..13812e17cb6 160000
--- a/configs
+++ b/configs
@@ -1 +1 @@
-Subproject commit 588811152643ca752381a52ec57986c0c4b1a376
+Subproject commit 13812e17cb6b800394d241cae3879032ce0643af