DO NOT USE

Some renaming of classes

I've also uncovered a threading issue with COM devices, I need to
resolve this.

Committing for testing on multiple platforms.