Berlin and Texas are still under construction, with neither having produced a single delivery car yet. I think they did conflate models with factories as you suspect, though.
Berlin factory is not necessarily behind the corner. Tesla is trying to cut corners there but Germany is not Wild West to let them do whatever they want.