I agree with bags. If it's individual size we called it a bun, (if the top was cut off, halved and put back on butter cream as 'wings' it was a butterfly bun). If it needed cutting up it was a cake. 'Cup cake' is, I think, an Americanism.
Last weekend, in Rutland, the first statue in Britain of the late Elizabeth II was unveiled.