renamed some files to be a bit more consistent