Rename from layer to x for consistency.
Rename context for topographic corr tests.