Section 23 of the Principal Act is amended as follows:

(a) by omitting from subsection (1) "electricity entity" first occurring and substituting "energy entity" ;

(b) by omitting from subsection (1)(e) "electricity entity" and substituting "energy entity" ;

(c) by omitting from subsection (2)(a) "electricity entity" and substituting "energy entity" ;

(d) by omitting from subsection (2)(b) "electricity entity" and substituting "energy entity" ;

(e) by omitting from subsection (3) "electricity entity" and substituting "energy entity" ;

(f) by omitting from subsection (5) "electricity entity" and substituting "energy entity" .