Fixed issue with layer name