Revert "consolidate name."

This reverts commit 0f553e6ea2d847e1c5d7a411892e2415ab158874.
Revert "fix indentation 2."

This reverts commit c42d4a977593d2fd0a2547d2e259c76c32b4bac0.