Rename metadata to extraLayerInfo to avoid confusion

This PR replaces #1450 
No probs. (IntelliJ spotted it, really)