Reshuffled file names again.

No use having the filenames contain the version name when
I'm using a version control system... doh!

Signed-off-by: RasmusB <RasmusB@users.noreply.github.com>