Small fixes and renamings