Some renaming and more fixes.

Signed-off-by: Alessandro Vioni <jenoma@gmail.com>