File naming.

Numerous changes so as to implement a coherent strategy for filenames.
Needs testing.
Git bug?