Fix renaming of Bjordal's files