replace more dictionary keys with Id in dockerio module