Fixed command names not using attribute value in Add Command