Renamed variables for consistency
Remove subnets from API, since we don't use them