Considering the following points, should it be Taj-Mahal or TEJO-MAHALAY?

 The term Taj Mahal is a corrupt form of the Sanskrit term TejoMahalay signifying a Shiva Temple. Agreshwar Mahadev i.e., The Lord of Agra was consecrated in it.

 The tradition of removing the shoes before climbing the marble platform originates from pre Shahjahan times when the Taj was a Shiva Temple. Had the Taj originated as a tomb, shoes need not have to be removed because shoes are a necessity in a cemetery.

 Visitors may notice that the base slab of the cenotaph is the marble basement in plain white while its superstructure and the other three cenotaphs on the two floors are covered with inlaid creeper designs. This indicates that the marble pedestal of the Shiva idol is still in place and Mumtaz's cenotaphs are fake.

 The pitchers carved inside the upper border of the marble lattice plus those mounted on it number 108-a number sacred in Hindu Temple tradition.

 There are persons who are connected with the repair and the maintenance of the Taj who have seen the ancient sacred Shiva Linga and other idols sealed in the thick walls and in chambers in the secret, sealed red stone stories below the marble basement. The Archaeological Survey of India is keeping discretely, politely and diplomatically silent about it to the point of dereliction of its own duty to probe into hidden historical evidence.

 In India there are 12 Shiva Lingas i.e., the outstanding Shiva Temples. The Tejomahalaya alias ‘The Taj-Mahal’ appears to be one of them known as Nagnatheshwar since its parapet is girdled with Naga, i.e., Cobra figures.

 The famous Hindu treatise on architecture titled Vishwakarma Vastushastra mentions the 'Tej-Linga' amongst the Shivalingas i.e., the stone emblems of Lord Shiva, the Hindu deity. Such a Tej Linga was consecrated in the Taj Mahal, hence the term Taj Mahal alias Tejo Mahalaya.

 Agra City, in which the Taj Mahal is located, is an ancient centre of Shiva worship. Its orthodox residents have through ages continued the tradition of worshipping at five Shiva shrines before taking the last meal every night especially during the month of Shravan. During the last few centuries the residents of Agra had to be content with worshipping at only four prominent Shiva temples viz., Balkeshwar, Prithvinath, Manakameshwar and Rajarajeshwar. They had lost track of the fifth Shiva deity, which their forefathers worshipped. Apparently the fifth was Agreshwar Mahadev Nagnatheshwar i.e., The Lord Great God of Agra, The Deity of the King of Cobras, consecrated in the Tejomahalay alias Taj-Mahal.

 The people who dominate the Agra region are Jats. Their name of Shiva is Tejaji. The Jat special issue of The Illustrated Weekly of India (June 28,1971) mentions that the Jats have the Teja Mandirs i.e., Teja Temples. This is because Teja-Linga is among the several names of the Shiva Lingas. From this it is apparent that the Taj-Mahal is Tejo-Mahalaya, The Great Abode of Tej.
Additional Details
All I can suggest to 'spangoriya' regarding the 'jats' is to get in touch with the publishers of "The Illustrated Weekly of India (June 28,1971)" for any factual inaccuracies.