Fix all references to be compatible with the new loading strategy (PreFetchDist). See Feature Request GH-135