minor changes/renames