section or the amendments made by this section may be construed to affect any voluntary separation incentive payment made prior to the date of the enactment of this Act under a program established by the Joint Committee on Judicial Administration in the District of Columbia or the District of Columbia Public Defender Service. 5. Adjustments in compensation rates for certain personnel (a) Attorneys representing indigent defendants (1) In general Section 11–2604(a), District of Columbia Official Code, is amended by striking at a fixed rate of $90 per hour and inserting an hourly rate not to exceed the rate payable under section 3006A(d)(1) of title 18, United States Code . (2) Effective date The amendments made by this section shall apply with respect to cases and proceedings initiated on or after the date of the enactment of this Act. (b) Criminal justice investigators (1) In general Section 11–2605, District of Columbia Official Code, is amended by striking (or, in the case of investigative services, a fixed rate of $25 per hour) each place it appears in subsections (b) and (c). (2) Effective date The amendments made by this section shall apply with respect to investigative services provided in connection with cases and proceedings initiated on or after the date of the enactment of this Act. 6. Authority of Executive Officer of Courts over Register of Wills (a) Appointment and removal (1) In general Section 11–1725(b), District of Columbia Official Code, is amended— (A) by inserting the Register of Wills, after the clerks of the courts,