Updates class naming
Corrects class reference
Updated references and naming
Merge branch 'develop'