Revert "What if we put the name after the type?"

This reverts commit 15eeb6c841a70cbc0c91da1aaa0bfa8b330843ad.