little rename for next merge

Change-Id: I0769b4893b1b65000d914ebcd7f43cb697e4baa2
final remerge

Change-Id: I7f99309d59a229ee49f4634c13de0def99270cd1