Raise specific errors instead of ConfigNamesError when appropriate

Raise specific errors instead of ConfigNamesError when appropriate #3364