Renamed tags to non specific