- rename Layer::Stone to Layer::Stones
- rename Layer::Marker to Layer::Markers