Handling layer name change