rename a few generic types "F" -> "E1"