Parameterizing names

An oddity - “Company” was defined but never used in the original.  This
is now {P1.Handle}.  Will keep bz will find uses for it.