more fixes for E_NOTICE.  first search using regexp for [Name], no quotes.