More renaming to make concepts clearer