#413 Fix name for directories and config files