more renaming
Merge branch 'master' of github.com:henrikhaugboelle/tco