Rename Configuration classes and refactor.