Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -40,11 +40,11 @@
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "js-path.scm")
 
-(require-library stml)
+(import stml2)
 (define (http-transport:make-server-url hostport)
   (if (not hostport)
       #f
       (conc "http://" (car hostport) ":" (cadr hostport))))
 

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -35,11 +35,11 @@
 
 (use ducttape-lib)
 
 (include "megatest-fossil-hash.scm")
 
-(require-library stml)
+(import stml2)
 
 ;; stuff for the mapper and checker functions
 ;;
 (define *target-mappers*  (make-hash-table)) 
 (define *runname-mappers* (make-hash-table)) 

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -22,11 +22,11 @@
 ;; Tests
 ;;======================================================================
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking tcp directory-utils)
 (import (prefix sqlite3 sqlite3:))
-(require-library stml)
+(import stml2)
 
 (declare (unit tests))
 (declare (uses lock-queue))
 (declare (uses db))
 (declare (uses tdb))