Revert "Disable name prepent"

This reverts commit 20df7e86247dfd4c6da3062bb601d2c415a3a2aa.