at the end of the definition of “county” there shall be inserted the words “, but in the expressions ”county council’, ”council of a county’, ”county councillor’ and ”councillor of a county’ means, in relation to England, a non-metropolitan county only;”;

in the definition of “principal area” for the words “county, Greater London” there shall be substituted the words “non-metropolitan county”.