renames variables accoring to core

Those here where overlooked when merging https://github.com/opf/openproject/pull/1646. Not sure why the CI did not pick this up, though. Specs are there...