fix name regex
update error message for accuracy
revert
fix name regex and error message