rename
Merge branch 'master' of https://github.com/SquidKit/SquidKit
fix up headers