Replace Mask Layers and rename label issue #24