Change Depreciated Tags

NOT YET WORKING