Yes, that is for an 18650 lithium ion, non-protected. You don't need the protection circuit board in the battery since you are using them as single cells. Because the protected batteries are a bit longer you could end up stripping the threads on the body if you try to tighten the cap too much. Oh, the two flats are fine.