Minor name changes
Moved something