Fixed a few file-naming related bugs...