Change to more comprehensive layer name
Merge