Create l2 interfaces in batch
* Also slight cleanup of interface names
* Due to the addition of batches the complexity went over the current
limit. I just ignored this for now. There are a few additional
cleanups that can be done here to avoid this but I'll save that part
for later.