Refactor to move more into name_loaders.py