Updated features for name refactoring

Change-Id: I08101f2fe6104510a8006a897c927f8dc8e03378