Update copyright
Second attempt at renaming to new scheme