Revert "Add naming feature"

This reverts commit 0cadb28a63833e9d80905e6d175efbd67299b0ce.
Revert "Revert "Add naming feature""

This reverts commit f31b540b55090306f10a3ed3300ba753b234bab1.