- restlet fix
- class name fixes