added support for name postfix