Better names for files and config settings

Shorter