Fixed misc naming errors/file names.