Added support for custom name rules