Everything should now be consistent - the only difference between files is the year (aside from generated files).

Fixes issue #531.