Rename User to Hitchhiker
mergin last changes