Refactor control selector name and name the layer node.