Variable name cleanup
Thread safety, and more refactoring of method names