update file from master
fix class names
update variable names and rebuild