* Temporary commit to make the Substrate CI happy

* Revert "Temporary commit to make the Substrate CI happy"

This reverts commit 9eb2fd223c3e36312242d4fda4ebacf3dd732547.

* Align to substrate master

* Update lock

* Adjust some naming according to the new substrate crates