Rename basic-map-layer to map-layer