Update scripts and rename for simplicity

Signed-off-by: lsenta <laurent.senta@gmail.com>