Further renamings for clarity