Update to use HashMap for name lookups in reload