Some renamings for clarity.