Renamed a few files

renamed a few files that could be misleading and to be more precise to
their meaning.