add cusom name support

Adding custom name support.