Replacing all 'savanna' names to 'sahara'

Change-Id: I431107508c70f9dd08e17a25dc660d91dacd45e0