adjust to new names PR #335