Name change, round 1
Remove Blamlib dependency
Merge branch 'dev'