Updates for use of regexp for custom attribute names.