- Improved classes in c.r.c.connection
- Some renaming