[ADD] support for custom names