To amend the National Capital Revitalization and Self-Government Improvement Act of 1997 to treat domestic partnerships as marriage for purposes of the program of benefits paid by the Federal government for survivors of a District of Columbia police officer, firefighter, or teacher in the same manner and to the same extent that domestic partnerships are treated as marriage for purposes of such benefits which are paid by the District of Columbia, to conform the age limit after which a surviving spouse of a police officer, firefighter, or teacher may remarry without losing survivor benefits under such program to the age limit established with respect to survivor benefits of Federal employees, and for other purposes.