Use consistent case for Id