Update layer variable naming to be more consistent with our other $base- usage

# Update layer variable naming to be more consistent with our other $base- usage

Status: **Opened for visibility**
Reviewers: @jeffkamo @ry5n 

## Changes
1. Renamed our layer variables to match the `$base-` prefixing used elsewhere.