Cleanup trailing whitespace.
Update filename references.