HTC may end the One naming madness with new O2 flagship