Refactor Loaders

And some name changes