Rename configuration objects, improve logging.