They should also simplify the license and eliminate the RPAL altogether.
They can easily combine the current two course by scrapping all the parts about cannons, flint lock, black powder etc, only test on bolt and semi rifles and include a semi handgun.
If people want to learn the other types the can do so separately.