fix id/name