Backwards compatible configuration and better naming.