Minor renamings

Those minor renamings would have saved me a few brain cycles when reading this code.