changed names to avoid confusions

Signed-off-by: Jedabero <jedabero@hotmail.com>