Fixed alias conflicts.