repo bootstrap: Fix review issues

Just some renaming.

Change-Id: 4b830ab775
Story-Id: SF-99