Revert "new inside but same name"

This reverts commit 03ff8a05d469880c0f200c748e26057b1df59e56.