Changed files to fit the name change