refactoring of two method names

Change-Id: Ia439ff31a16e5aa196e50d345fd8a49ac6b1448e