Merge pull request #1296 from arrbee/stricter-config-name-checks Stricter config entry name validation