Layers: changed layer names to conform to spec
47 files changed