Fix problems that arrose from file name changes