Cleaner file names

used slightly more sensible file names