Fixed file naming and another renaming bug.