Make the configuration keys more consistent