remove "master" from names

Change-Id: Ibf4cb2b005cc57bcb11e298dd5109cfe309c9ec3