Fix BSD licence names after merge