Minor Edits for Name Changes
Revert "Minor Edits for Name Changes"

This reverts commit 8267f19f61fd1688b37210e15a8f2e4bcde9823d.