Issue #505 done for tableName field
Issue #505 done for fieldName field