After some contemplation, I think we should be adding the "-id" to all those other places.