There was some confusion caused by the names so this CL changes them to make the differentiation more clear hopefully. Test: robotests pass, build runs, functionality of clients intact Bug: 126944845 Change-Id: I626dd8e38c59fb5c061e4d0fdcf8c81701c459a3