Match name created by BF PR.

Following g+ discussion, Made changes to match B-F PR