Rename files.
Enhancements to get loader working.