updated names to be contention compliant