Forgot some renamings