cleanup
added componentNameMap for fast lookup