Fixed even more references to incorrect files.