Couple of months is more realistic term, because currently we are too busy with Boolean search, bulk edit and fixing old bugs. "Canonical names" are not for the next update, but for the one following it.