Fix clat+mock names

Change-Id: I08b07685fdd85034714720860b8a0de2e678a1b7