Add/Fix parsing of component names with non-whitespace characters