Corrected some issues with filenames that were missed when the code base was split into separate files.