Fix jumping
Fix naming