changed to new current layer names