Section 1. Section 2 of Republic Act No. 8508, otherwise known as the Charter of the City of Antipolo is hereby amended to read as follows:

"SEC. 2.  The City of Antipolo. — The Municipality of Antipolo is hereby converted into a component city to be known as the City of Antipolo, hereinafter referred to as the City, which shall comprise of the present territory of the Municipality of Antipolo, Rizal, covering the sixteen (16) barangays of both First District of Antipolo, namely:

1. Barangay Dela Paz;

2. Barangay San Isidro;

3. Barangay Beverly Hills;

4. Barangay Sta. Cruz;

5. Barangay Mayamot;

6. Barangay Mambugan;

7. Barangay Bagong Nayon; and

8. Barangay Munting Dilao; and

9. Barangay Cupang;

10. Barangay San Juan;

11. Barangay Inarawan;

12. Barangay Calawis;

13. Barangay Dalig;

14. Barangay San Jose;

15. Barangay San Roque; and

16. Barangay San Luis.

"Henceforth, the City of Antipolo shall be deemed as divided into two (2) districts: First District and Second District for better supervision and a more efficient delivery of services.

"The foregoing provision shall be without prejudice to the resolution or determination by the appropriate agency or forum of existing and/or future boundary disputes or cases involving the present sixteen (16) barangays of the City of Antipolo and between the City and the other adjoining municipalities.