Fix naming issues in storage cmdlet.

#1217 and #1218