Fix variable names
Merge
Fix deprecated class loader call, renamed global variables to have _, cleaned up launch files
merged