fixes compile errors with recent renames.