Added support for mono naming scheme