Update config var patterns
Update naming