Rename upload storage backends to be device name independent

Change-Id: I45b8067bd663207e5677a04c3b4c596d8bb80c7a