Change some enum usage in Network