Code style and some renamings

Signed-off-by: Alessandro D'Aquino (elara) <alex@midokura.com>