Moved the names of fields outside...