Naming tweaks, loading fixes.