Change of file name

Continuing to change the file names of the relevant files to make a little more
sense of the code we have to modify.