Parameterize bucket name. Fixes.

Change-Id: Id54cd9a8889ca65cc45e93b02a4772ba5a2238aa