better naming

Change-Id: I6114c0e2feda72a4e975a0d7a3e415e155aeb1e4