Reintroduces COUT and CERR
Renames some types, nothing semantic