Change name of generated sub. closes #731