You are indeed correct. Many of the mandatory minimum penalties that will remain after Bill C-5 is adopted are five- and seven-year mandatory minimum penalties for offences in which a restricted or prohibited firearm is used, when the offences are in connection with organized crime. The mandatory minimum penalties that are targeted, let's say, for firearm offences in this bill are the ones in the “in any other case” category, which particularly relates to the use of firearms like long guns.
On April 8th, 2022. See this statement in context.