name replacement
fixes #96
fixes #95
fixes #97
fixes #91
fixes #99