Also use camel case for the other ids