Update layer variable naming to be more consistent