Renamings for clarity