Removed unnecessary "UsrDef" from functions names in classfactory.