fix id names