Fix layernames