moving parameter and entity names to xml factory