We should consider renaming StorageID to something else since we have changed the meaning of the field. Previously it was used to identify the single logical storage attached to a datanode and hence it was a de-facto identifier for a Datanode. Now the StorageID identifies a single storage. To avoid confusion of meaning especially when merging with other feature branches it may be best to rename it to something else.
We can do so when merging phase 1 of the Heterogeneous Storage work into trunk.
A partial list of places to update: