Prefix layernames

Fix for #745