Make Names Consistent With Study Materials
Renames For Consistency With Course Material