A first step towards name consistency in the files.