Fix names, warnings, typos (still some left)