I think so, yes.
I wouldn't call them military-style assault weapons. I would call them self-loading semi-automatic or automatic weapons. I would use the way they work, the mechanics of the weapons, to classify them instead of using the length of the barrel. It would be clearer and easier to amend and to work with, because to define “military-style assault weapons” is a bit elastic for some and too restrictive for others. The law should be amended.