Added the resolve name function. Converted enable and disable to use the resolved name.