[BUGFIX beta] Allow tagName to be a CP with deprecation