Yes, and you will not be required to again register the firearm before replacing the short barrel. ATF recommends written notification to the NFA Branch when a firearm’s configuration is permanently changed or removed from the purview of the NFA.