Resolve the naming discrepancy for the area barriers layer. Fixes #40