Some naming changes
Cleaned up some more of the terms, and path