Fixing incorrect names