cleaning up the Survival name and language

Change-Id: I082f0980b96d1969f1d78c66c6eef01896a20dec