Fixed bugs due to renaming of files, but actually commit them this time