renaming complete for now

Instances are in tracker
Types are in config
cleanup

run gofmt