remove caf from the name

Change-Id: Ie37039bb837f5453d42e27b9026055e85fc46ec3