Updated Layering

The layering naming has been improved to work better with the reporting
spreadsheet