Using the filenames where relevant

Sometimes it's hard to tell which file the code is intended to go in. Now it spells it out.
Merge pull request #1178 from rprince/patch-3

Using the filenames where relevant