Renamed "os" to "operating_system"
Renamed "router" to "router_id"