Fixed errors caused by file renaming