Fixed: Basic naming settings take existing format into consideration