diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index e875bc82..d50cde56 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -324,45 +324,62 @@ DECLARE
   returnstr TEXT DEFAULT '';
 BEGIN
 	-- Object type to table name
+    -- //CoreBizObject add here
 	case ayobjecttype
-		when 2 then aytable =  'awidget';
-		when 3 then aytable =  'auser';
-		when 8 then aytable =  'acustomer';
+		when XX_NONAME return 'LT:XXX';
+        when XX_COREBIZ then aytable = 'XXX';
+        when 0 then return 'LT:NoType';
+        when 1 then return 'LT:Global';
+		when 2 then aytable = 'awidget';
+		when 3 then aytable = 'auser';
+        when 4 then return 'LT:ServerState';
+		when 5 return 'LT:License';
+		when 6 return 'LT:LogFile';
+		when 7 return 'LT:PickListTemplate';
+        when 8 then aytable = 'acustomer';
+		when 9 return 'LT:ServerJob';
+        when 10 then aytable = 'acontract';
+		when 11 return 'LT:TrialSeeder';
+		when 12 return 'LT:ServerMetrics';
+        when 13 then aytable =  'atranslation';
+		when 14 return 'LT:UserOptions';
+        when 15 then aytable = 'aheadoffice';
+        when 16 then aytable = 'aloanunit';        
+        when 17 then aytable = 'afileattachment'; aynamecolumn ='displayfilename';
+        when 18 then aytable = 'adatalistview';
+        when XX_COREBIZ then aytable = 'XXX';
+        when XX_COREBIZ then aytable = 'XXX';
+        when XX_COREBIZ then aytable = 'XXX';
+        when XX_COREBIZ then aytable = 'XXX';
+        when XX_COREBIZ then aytable = 'XXX';
+
+
+
+
 		when 25 then aytable = 'aproject';
 		when 33 then aytable = 'avendor';
 		   else
-	    	  RETURN '-';-- unknown or not supported just return default string
+	    	  RETURN format('??PUBLIC.AYGETNAME-UNKNOWN_TYPE:%S',ayobjecttype);-- This should not happen unless dev forgot to update this
 	end case;
 	EXECUTE format('SELECT %I FROM %I WHERE id = %L', aynamecolumn, aytable, ayobjectid)  INTO returnstr;
     RETURN returnstr;
 END;
 $BODY$ LANGUAGE PLPGSQL STABLE /*
-NoType = 0,
-        Global = 1,
+
+         = 9,
         [CoreBizObject]
-        Widget = 2,
+         = 10,
+         = 11,
+         = 12,
+         = 13,
+         = 14,
         [CoreBizObject]
-        User = 3,
-        ServerState = 4,
-        License = 5,
-        LogFile = 6,
-        PickListTemplate = 7,
+         = 15,
         [CoreBizObject]
-        Customer = 8,
-        ServerJob = 9,
-        [CoreBizObject]
-        Contract = 10,
-        TrialSeeder = 11,
-        ServerMetrics = 12,
-        Translation = 13,
-        UserOptions = 14,
-        [CoreBizObject]
-        HeadOffice = 15,
-        [CoreBizObject]
-        LoanUnit = 16,
-        FileAttachment = 17,
-        DataListView = 18,
-        FormCustom = 19,
+         = 16,
+         = 17, see namefetcher
+         = 18,
+        FormCustom = 19, see namefetcher
         [CoreBizObject]
         Part = 20,
         [CoreBizObject]