Naming updates
Merge branch 'master' of github.com:OpenDSA/OpenDSA
Updating names