Rename some things
Fix benchmark + some comments