Update to new name and resolve minor warnings
cleanup
Merge remote-tracking branch 'origin/master'