Some renamings and small fixes.