Fix namespace issue causing build failure
Fix misnamed class (case sensitivity)
Merge branch 'develop'