E435: Rename and bugs fixes

Signed-off-by: Caio99BR <caiooliveirafarias0@gmail.com>