Rename metadata to extraLayerInfo to avoid confusion

This PR replaces #1450