Fix layer name affinitic refs #5749