Part of an effort to move toward file names that are more descriptive (and
less like the word 'description').

To allow time for migration, files with the old extension are also still
processed.