Eliminate some usage of NamingFactory when we have the Table to provide
us with the same info