Yes you are correct, I was mistaken - An F1 is a cross of two distinct varieties (P1 x P2). An F2 is a cross of the F1 generation (ie brothers and sisters)
It would be a lot easier/clearer if we adopted the nomenclature proposed by @Sebring