Change factory name to something less generic and more unique, to avoid confusion [2/2]
Change entry items name to something more relevant to the application