Some renamings and comments

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>
Small share fix

Signed-off-by: Nico Rutishauser <nr@hotmail.ch>