Fix agnostic caps names

Change-Id: I381425b678cd58ae86ac2bb2bdf177cf215f6019