Improperly categorized depreciable assets

I'm switching from an accountant to TurboTax this year and just realized my previous accountants (2 different people over the previous 4 years) miscategorized some assets.  I have camera equipment and camera accessories that I both use and rent out.  One accountant started depreciating my equipment as furniture/fixtures, which is 7 years so same as video equipment.  Maybe no big deal.  The other accountant started depreciating newer assets I purchased as machinery/equipment, which is a 5 year schedule and would change the math if I switched categories so obviously a bigger deal.  Can I switch everything to the proper category or do I just continue each item as it was started, knowing that the category is wrong? 

 

FYI - sole proprieter 1040 Sch C