Refactor name of loader/manager
Fix name-fallback to be as it was intended