Renamed, and added several fixes

Signed-off-by: Ivan Gozali <ivan.gozali@arrayent.com>