Add a name state
add name state (2)
Revert "add name state (2)"

This reverts commit 98eb7242fe19d99c564e965658a1363ba39042b7.