Fix configuration names

Change-Id: I8f179c277a3bc6ca5d61edf57a784503a5e418bb