Squadron formed C Squadron. Six years of relative stability followed before further changes occurred. In 1999 a wide-ranging review and reorganisation of the TF took place that resulted in the transfer of the Wai/WEC Squadron to the 6th Battalion (Hauraki), Royal New Zealand Infantry Regiment (RNZIR) – a Territorial infantry unit based in Tauranga in the Bay of Plenty. 1999–today Within the Haurakis, C and D Companies were absorbed into Wai/WEC Squadron, together being known as the Waikato Squadron, although no official title change took place. The Squadron's recruiting boundaries were reduced to conform to those of the Haurakis, which excluded the Wellington/East Coast region. The years that followed proved a particular challenge to the Squadron, as it fought to retain its existence, separate identity and mounted reconnaissance role. At the TF Seminar in August 2002, the Chief of Army, Major General Mateparae, directed that – in the interests of fostering unit pride, respecting tradition, raising morale, strengthening links with local communities and assisting recruitment – Territorial units (and where appropriate sub-units) would revert to their previous titles. To accommodate these changes, Territorial infantry regiments would form battalion groups; thus the Haurakis would become the 6th (Hauraki) Battalion Group in which Wai/WEC Squadron would be a sub-unit. The re-adoption of historical titles did not alter battalion group boundaries, so with the loss of the Wellington East Coast region it was inappropriate to maintain the WEC part of the Squadron's title. This provided the opportunity for the Squadron to return to its historical roots and revive the title of the Waikato Mounted Rifles. In early 2003, and strongly supported by the Waikato Mounted Rifles Regimental Association, a formal submission was made to alter the Squadron's title. This was approved by the Chief of Army in September of the same year. A further submission was to follow. This was for the restoration of the WMR hat and collar badges. After a protracted campaign, this was eventually agreed in April 2006. Based exactly on the pre-1914 originals, it was not however until May 2008 that the new badges were finally presented to Squadron personnel by the then Colonel Commandant RNZAC, Brigadier IH Duthie, CNZM. In 2003, WMR's role was defined as: "...to provide general purpose medium reconnaissance, surveillance and target acquisition in order to support New Zealand Light Armoured Vehicle mounted battalion operations. It is to provide trained personnel to top up and