Renamed types
Minor clean ups
Yet Another Rename to avoid python std lib conflict
Transtions cogs types and tests