Added ability to specify name conversion