Revert names and use parent variables