Changing naming due to CR comment