remove unnecessary NamingFactory usage