From: tama3 <tama3@acee48c3-7b26-0410-bdac-b3d0e5314bbc>
Date: Fri, 13 Jul 2007 06:11:47 +0000 (+0000)
Subject: rename BirthmarkContext to BirthmarkEnvironment
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=14ea15e94799621ccf678975fc0ede7ad79943ed;p=stigmata%2Fstigmata-core.git

rename BirthmarkContext to BirthmarkEnvironment

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/stigmata/trunk@165 acee48c3-7b26-0410-bdac-b3d0e5314bbc
---

diff --git a/src/main/java/jp/naist/se/stigmata/BirthmarkContext.java b/src/main/java/jp/naist/se/stigmata/BirthmarkEnvironment.java
similarity index 89%
rename from src/main/java/jp/naist/se/stigmata/BirthmarkContext.java
rename to src/main/java/jp/naist/se/stigmata/BirthmarkEnvironment.java
index b2d782f..2ca399d 100644
--- a/src/main/java/jp/naist/se/stigmata/BirthmarkContext.java
+++ b/src/main/java/jp/naist/se/stigmata/BirthmarkEnvironment.java
@@ -1,7 +1,7 @@
 package jp.naist.se.stigmata;
 
 /*
- * $Id$
+ * $Id: BirthmarkContext.java 140 2007-06-28 10:48:47Z tama3 $
  */
 
 import java.beans.PropertyChangeEvent;
@@ -25,18 +25,18 @@ import jp.naist.se.stigmata.utils.WellknownClassManager;
 /**
  * This class represents the context for extracting/comparing birthmarks.
  * @author  Haruaki TAMADA
- * @version  $Revision$ $Date$
+ * @version  $Revision: 140 $ $Date: 2007-06-28 19:48:47 +0900 (Thu, 28 Jun 2007) $
  */
-public class BirthmarkContext{
+public class BirthmarkEnvironment{
     /**
      * Default context. All instance of this class is based on default context.
      */
-    private static BirthmarkContext DEFAULT_CONTEXT = new BirthmarkContext(true);
+    private static BirthmarkEnvironment DEFAULT_CONTEXT = new BirthmarkEnvironment(true);
 
     /**
      * parent of this context.
      */
-    private BirthmarkContext parent;
+    private BirthmarkEnvironment parent;
 
     /**
      * context for classpath.
@@ -77,7 +77,7 @@ public class BirthmarkContext{
     /**
      * constructor for root context
      */
-    private BirthmarkContext(boolean flag){
+    private BirthmarkEnvironment(boolean flag){
         manager = new WellknownClassManager();
         bytecodeContext = ClasspathContext.getDefaultContext();
         filterManager = new ComparisonPairFilterManager();
@@ -87,14 +87,14 @@ public class BirthmarkContext{
      * default constructor. The instance constructed by this constructor has
      * default context as the parent.
      */
-    public BirthmarkContext(){
+    public BirthmarkEnvironment(){
         this(getDefaultContext());
     }
 
     /**
      * constructor for specifying parent context.
      */
-    public BirthmarkContext(BirthmarkContext parent){
+    public BirthmarkEnvironment(BirthmarkEnvironment parent){
         this.parent = parent;
         this.manager = new WellknownClassManager(parent.getWellknownClassManager());
         this.bytecodeContext = new ClasspathContext(parent.getClasspathContext());
@@ -104,11 +104,11 @@ public class BirthmarkContext{
     /**
      * returns the default birthmark context.
      */
-    public static final BirthmarkContext getDefaultContext(){
+    public static final BirthmarkEnvironment getDefaultContext(){
         return DEFAULT_CONTEXT;
     }
 
-    public BirthmarkContext getParent(){
+    public BirthmarkEnvironment getParent(){
         return parent;
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/BirthmarkExtractor.java b/src/main/java/jp/naist/se/stigmata/BirthmarkExtractor.java
index 5a26686..ae45269 100644
--- a/src/main/java/jp/naist/se/stigmata/BirthmarkExtractor.java
+++ b/src/main/java/jp/naist/se/stigmata/BirthmarkExtractor.java
@@ -48,12 +48,12 @@ public interface BirthmarkExtractor{
     /**
      * extract birthmark from given stream with given context.
      */
-    public Birthmark extract(InputStream in, BirthmarkContext context) throws BirthmarkExtractionFailedException;
+    public Birthmark extract(InputStream in, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException;
 
     /**
      * extract birthmark from given byte array with given context.
      */
-    public Birthmark extract(byte[] bytecode, BirthmarkContext context) throws BirthmarkExtractionFailedException;
+    public Birthmark extract(byte[] bytecode, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException;
 
     /**
      * extract birthmark from given stream and add element to given birthmark object.
@@ -68,10 +68,10 @@ public interface BirthmarkExtractor{
     /**
      * extract birthmark from given stream with given context and add element to given birthmark object.
      */
-    public Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkContext context) throws BirthmarkExtractionFailedException;
+    public Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException;
 
     /**
      * extract birthmark from given byte array with given context and add element to given birthmark object.
      */
-    public Birthmark extract(Birthmark birthmark, byte[] bytecode, BirthmarkContext context) throws BirthmarkExtractionFailedException;
+    public Birthmark extract(Birthmark birthmark, byte[] bytecode, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException;
 }
diff --git a/src/main/java/jp/naist/se/stigmata/CertainPairComparisonResultSet.java b/src/main/java/jp/naist/se/stigmata/CertainPairComparisonResultSet.java
index e957c59..f9a448f 100644
--- a/src/main/java/jp/naist/se/stigmata/CertainPairComparisonResultSet.java
+++ b/src/main/java/jp/naist/se/stigmata/CertainPairComparisonResultSet.java
@@ -20,14 +20,14 @@ import java.util.Map;
  * @version  $Revision$ $Date$
  */
 public class CertainPairComparisonResultSet implements ComparisonResultSet{
-    private BirthmarkContext context;
+    private BirthmarkEnvironment context;
     private List<ComparisonPair> pairList = new ArrayList<ComparisonPair>();
     private Map<URL, BirthmarkSet> sources = new HashMap<URL, BirthmarkSet>();
 
     /**
      * This constructor is the comparison pair list is specified.
      */
-    public CertainPairComparisonResultSet(ComparisonPair[] pairs, BirthmarkContext context){
+    public CertainPairComparisonResultSet(ComparisonPair[] pairs, BirthmarkEnvironment context){
         this.context = context;
         for(int i = 0; i < pairs.length; i++){
             pairList.add(pairs[i]);
@@ -39,7 +39,7 @@ public class CertainPairComparisonResultSet implements ComparisonResultSet{
     /**
      * This constructor is the comparison pair was guessed with class name.
      */
-    public CertainPairComparisonResultSet(BirthmarkSet[] targetX, BirthmarkSet[] targetY, BirthmarkContext context){
+    public CertainPairComparisonResultSet(BirthmarkSet[] targetX, BirthmarkSet[] targetY, BirthmarkEnvironment context){
         this.context = context;
         for(int i = 0; i < targetX.length; i++){
             BirthmarkSet target2 = findTarget(targetX[i].getName(), targetY);
@@ -55,7 +55,7 @@ public class CertainPairComparisonResultSet implements ComparisonResultSet{
     /**
      * This constructor is the comparison pair was specified as mapping.
      */
-    public CertainPairComparisonResultSet(BirthmarkSet[] targetX, BirthmarkSet[] targetY, Map<String, String> mapping, BirthmarkContext context){
+    public CertainPairComparisonResultSet(BirthmarkSet[] targetX, BirthmarkSet[] targetY, Map<String, String> mapping, BirthmarkEnvironment context){
         this.context = context;
         for(Map.Entry<String, String> entry: mapping.entrySet()){
             BirthmarkSet target1 = findTarget(entry.getKey(), targetX);
@@ -81,7 +81,7 @@ public class CertainPairComparisonResultSet implements ComparisonResultSet{
     /**
      * return the context.
      */
-    public BirthmarkContext getContext(){
+    public BirthmarkEnvironment getContext(){
         return context;
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/ComparisonPair.java b/src/main/java/jp/naist/se/stigmata/ComparisonPair.java
index 60e5967..c9b5ceb 100644
--- a/src/main/java/jp/naist/se/stigmata/ComparisonPair.java
+++ b/src/main/java/jp/naist/se/stigmata/ComparisonPair.java
@@ -16,12 +16,12 @@ import java.util.List;
 public class ComparisonPair implements Iterable<ComparisonPairElement>{
     private BirthmarkSet target1;
     private BirthmarkSet target2;
-    private BirthmarkContext context;
+    private BirthmarkEnvironment context;
 
     /**
      * constructor.
      */
-    public ComparisonPair(BirthmarkSet target1, BirthmarkSet target2, BirthmarkContext context){
+    public ComparisonPair(BirthmarkSet target1, BirthmarkSet target2, BirthmarkEnvironment context){
         this.target1 = target1;
         this.target2 = target2;
         this.context = context;
diff --git a/src/main/java/jp/naist/se/stigmata/ComparisonResultSet.java b/src/main/java/jp/naist/se/stigmata/ComparisonResultSet.java
index 0fa1f81..2d45f3f 100644
--- a/src/main/java/jp/naist/se/stigmata/ComparisonResultSet.java
+++ b/src/main/java/jp/naist/se/stigmata/ComparisonResultSet.java
@@ -16,7 +16,7 @@ public interface ComparisonResultSet extends Iterable<ComparisonPair>{
     /**
      * returns the birthmark context.
      */
-    public BirthmarkContext getContext();
+    public BirthmarkEnvironment getContext();
 
     /**
      * returns a iterator for {@link ComparisonPair <code>ComparisonPair</code>}.
diff --git a/src/main/java/jp/naist/se/stigmata/Main.java b/src/main/java/jp/naist/se/stigmata/Main.java
index e310683..75101eb 100644
--- a/src/main/java/jp/naist/se/stigmata/Main.java
+++ b/src/main/java/jp/naist/se/stigmata/Main.java
@@ -46,7 +46,7 @@ import org.xml.sax.SAXException;
  */
 public final class Main{
     private FormatManager manager = FormatManager.getInstance();
-    private BirthmarkContext context;
+    private BirthmarkEnvironment context;
 
     /**
      * main process.
diff --git a/src/main/java/jp/naist/se/stigmata/RoundRobinComparisonResultSet.java b/src/main/java/jp/naist/se/stigmata/RoundRobinComparisonResultSet.java
index d9940cc..d45c314 100644
--- a/src/main/java/jp/naist/se/stigmata/RoundRobinComparisonResultSet.java
+++ b/src/main/java/jp/naist/se/stigmata/RoundRobinComparisonResultSet.java
@@ -20,7 +20,7 @@ import java.util.Map;
 public class RoundRobinComparisonResultSet implements ComparisonResultSet{
     private List<BirthmarkSet> holders1;
     private List<BirthmarkSet> holders2;
-    private BirthmarkContext context;
+    private BirthmarkEnvironment context;
 
     private int compareCount;
     private boolean tablePair = true;
@@ -31,7 +31,7 @@ public class RoundRobinComparisonResultSet implements ComparisonResultSet{
      * the instance (created by this constructor) compares { a<->b, a<->c,
      * b<->c, }.
      */
-    public RoundRobinComparisonResultSet(BirthmarkSet[] holders1, BirthmarkContext context){
+    public RoundRobinComparisonResultSet(BirthmarkSet[] holders1, BirthmarkEnvironment context){
         this(holders1, context, false);
     }
 
@@ -42,7 +42,7 @@ public class RoundRobinComparisonResultSet implements ComparisonResultSet{
      * Otherwise, the instance compares { a<->b, a<->c, b<->c, } when
      * samePair is false.
      */
-    public RoundRobinComparisonResultSet(BirthmarkSet[] holders1, BirthmarkContext context,
+    public RoundRobinComparisonResultSet(BirthmarkSet[] holders1, BirthmarkEnvironment context,
                                           boolean samePair){
         this.holders1 = Arrays.asList(holders1);
         this.holders2 = Arrays.asList(holders1);
@@ -58,7 +58,7 @@ public class RoundRobinComparisonResultSet implements ComparisonResultSet{
      * a<->z, b<->x, b<->y, b<->z, c<->x, c<->y, c<->z, }.
      */
     public RoundRobinComparisonResultSet(final BirthmarkSet[] holders1, final BirthmarkSet[] holders2,
-                                          BirthmarkContext context){
+                                          BirthmarkEnvironment context){
         this.holders1 = Arrays.asList(holders1);
         this.holders2 = Arrays.asList(holders2);
         this.context = context;
@@ -70,7 +70,7 @@ public class RoundRobinComparisonResultSet implements ComparisonResultSet{
     /**
      * @return  context
      */
-    public BirthmarkContext getContext(){
+    public BirthmarkEnvironment getContext(){
         return context;
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/Stigmata.java b/src/main/java/jp/naist/se/stigmata/Stigmata.java
index 20ed8de..12594b8 100644
--- a/src/main/java/jp/naist/se/stigmata/Stigmata.java
+++ b/src/main/java/jp/naist/se/stigmata/Stigmata.java
@@ -50,7 +50,7 @@ import org.apache.commons.beanutils.BeanUtils;
 public final class Stigmata{
     private static final Stigmata instance = new Stigmata();
 
-    private BirthmarkContext defaultContext = BirthmarkContext.getDefaultContext();
+    private BirthmarkEnvironment defaultContext = BirthmarkEnvironment.getDefaultContext();
     private boolean configDone = false;
     private Stack<WarningMessages> stack = new Stack<WarningMessages>();
     private WarningMessages warnings;
@@ -115,11 +115,11 @@ public final class Stigmata{
     }
 
     /**
-     * create a new {@link BirthmarkContext <code>BirthmarkContext</code>}.
+     * create a new {@link BirthmarkEnvironment <code>BirthmarkContext</code>}.
      */
-    public BirthmarkContext createContext(){
+    public BirthmarkEnvironment createContext(){
         operationStart(OperationType.CREATE_CONTEXT);
-        BirthmarkContext context = new BirthmarkContext();
+        BirthmarkEnvironment context = new BirthmarkEnvironment();
         operationDone(OperationType.EXTRACT_BIRTHMARKS);
         return context;
     }
@@ -133,7 +133,7 @@ public final class Stigmata{
     }
 
     public BirthmarkSet[] extract(String[] birthmarks, String[] files,
-                                  BirthmarkContext context) throws BirthmarkExtractionFailedException{
+                                  BirthmarkEnvironment context) throws BirthmarkExtractionFailedException{
         operationStart(OperationType.EXTRACT_BIRTHMARKS);
         try{
             return extractImpl(birthmarks, files, context);
@@ -152,7 +152,7 @@ public final class Stigmata{
         return crs;
     }
 
-    public ComparisonResultSet compare(BirthmarkSet[] holders, BirthmarkContext context) throws IOException{
+    public ComparisonResultSet compare(BirthmarkSet[] holders, BirthmarkEnvironment context) throws IOException{
         operationStart(OperationType.COMPARE_BIRTHMARKS);
         ComparisonResultSet result = new RoundRobinComparisonResultSet(holders, context, true);
         operationDone(OperationType.COMPARE_BIRTHMARKS);
@@ -167,7 +167,7 @@ public final class Stigmata{
         return crs;
     }
 
-    public ComparisonResultSet compare(BirthmarkSet[] holders1, BirthmarkSet[] holders2, BirthmarkContext context) throws IOException{
+    public ComparisonResultSet compare(BirthmarkSet[] holders1, BirthmarkSet[] holders2, BirthmarkEnvironment context) throws IOException{
         operationStart(OperationType.COMPARE_BIRTHMARKS);
         ComparisonResultSet result = new RoundRobinComparisonResultSet(holders1, holders2, context);
         operationDone(OperationType.COMPARE_BIRTHMARKS);
@@ -183,7 +183,7 @@ public final class Stigmata{
         return crs;
     }
 
-    public ComparisonResultSet filter(ComparisonResultSet resultset, String[] filters, BirthmarkContext context){
+    public ComparisonResultSet filter(ComparisonResultSet resultset, String[] filters, BirthmarkEnvironment context){
         operationStart(OperationType.FILTER_BIRTHMARKS);
         if(filters != null){
             List<ComparisonPairFilterSet> filterList = new ArrayList<ComparisonPairFilterSet>();
@@ -213,7 +213,7 @@ public final class Stigmata{
         return crs;
     }
 
-    public ComparisonResultSet filter(ComparisonResultSet resultset, ComparisonPairFilterSet[] filters, BirthmarkContext context){
+    public ComparisonResultSet filter(ComparisonResultSet resultset, ComparisonPairFilterSet[] filters, BirthmarkEnvironment context){
         operationStart(OperationType.FILTER_BIRTHMARKS);
         FilteredComparisonResultSet filterResultSet = new FilteredComparisonResultSet(resultset);
         operationDone(OperationType.FILTER_BIRTHMARKS);
@@ -228,7 +228,7 @@ public final class Stigmata{
         return similarity;
     }
 
-    public double compareDetails(BirthmarkSet h1, BirthmarkSet h2, BirthmarkContext context){
+    public double compareDetails(BirthmarkSet h1, BirthmarkSet h2, BirthmarkEnvironment context){
         operationStart(OperationType.COMPARE_DETAIL_BIRTHMARKS);
 
         List<Double> list = new ArrayList<Double>();
@@ -259,7 +259,7 @@ public final class Stigmata{
         return similarity / count;
     }
 
-    private BirthmarkExtractor[] createExtractors(String[] birthmarkTypes, BirthmarkContext context){
+    private BirthmarkExtractor[] createExtractors(String[] birthmarkTypes, BirthmarkEnvironment context){
         List<BirthmarkExtractor> list = new ArrayList<BirthmarkExtractor>();
         for(String type: birthmarkTypes){
             BirthmarkExtractor extractor = createExtractor(type, context);
@@ -268,7 +268,7 @@ public final class Stigmata{
         return list.toArray(new BirthmarkExtractor[list.size()]);
     }
 
-    private BirthmarkExtractor createExtractor(String birthmarkType, BirthmarkContext context){
+    private BirthmarkExtractor createExtractor(String birthmarkType, BirthmarkEnvironment context){
         BirthmarkSpi spi = context.getService(birthmarkType);
         if(spi != null){
             BirthmarkExtractor extractor = spi.getExtractor();
@@ -363,7 +363,7 @@ public final class Stigmata{
         }
     }
 
-    private BirthmarkSet[] extractImpl(String[] birthmarks, String[] files, BirthmarkContext context) throws IOException, BirthmarkExtractionFailedException{
+    private BirthmarkSet[] extractImpl(String[] birthmarks, String[] files, BirthmarkEnvironment context) throws IOException, BirthmarkExtractionFailedException{
         ClassFileArchive[] archives = createArchives(files, context);
         BirthmarkExtractor[] extractors = createExtractors(birthmarks, context);
         ExtractionUnit unit = context.getExtractionUnit();
@@ -380,7 +380,7 @@ public final class Stigmata{
         return null;
     }
 
-    private BirthmarkSet[] extractFromPackage(ClassFileArchive[] archives, BirthmarkExtractor[] extractors, BirthmarkContext context) throws IOException, BirthmarkExtractionFailedException{
+    private BirthmarkSet[] extractFromPackage(ClassFileArchive[] archives, BirthmarkExtractor[] extractors, BirthmarkEnvironment context) throws IOException, BirthmarkExtractionFailedException{
         Map<String, BirthmarkSet> list = new HashMap<String, BirthmarkSet>();
 
         for(ClassFileArchive archive: archives){
@@ -424,7 +424,7 @@ public final class Stigmata{
         return n;
     }
 
-    private BirthmarkSet[] extractFromClass(ClassFileArchive[] archives, BirthmarkExtractor[] extractors, BirthmarkContext context) throws IOException, BirthmarkExtractionFailedException{
+    private BirthmarkSet[] extractFromClass(ClassFileArchive[] archives, BirthmarkExtractor[] extractors, BirthmarkEnvironment context) throws IOException, BirthmarkExtractionFailedException{
         List<BirthmarkSet> list = new ArrayList<BirthmarkSet>();
 
         for(ClassFileArchive archive: archives){
@@ -447,7 +447,7 @@ public final class Stigmata{
         return list.toArray(new BirthmarkSet[list.size()]);
     }
 
-    private BirthmarkSet[] extractFromProduct(ClassFileArchive[] archives, BirthmarkExtractor[] extractors, BirthmarkContext context) throws IOException, BirthmarkExtractionFailedException{
+    private BirthmarkSet[] extractFromProduct(ClassFileArchive[] archives, BirthmarkExtractor[] extractors, BirthmarkEnvironment context) throws IOException, BirthmarkExtractionFailedException{
         List<BirthmarkSet> list = new ArrayList<BirthmarkSet>();
 
         for(ClassFileArchive archive: archives){
@@ -482,7 +482,7 @@ public final class Stigmata{
         return list.toArray(new BirthmarkSet[list.size()]);
     }
 
-    private ClassFileArchive[] createArchives(String[] files, BirthmarkContext context) throws IOException, MalformedURLException{
+    private ClassFileArchive[] createArchives(String[] files, BirthmarkEnvironment context) throws IOException, MalformedURLException{
         ClasspathContext bytecode = context.getClasspathContext();
         List<ClassFileArchive> archives = new ArrayList<ClassFileArchive>();
         for(int i = 0; i < files.length; i++){
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/ASMBirthmarkExtractor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/ASMBirthmarkExtractor.java
index 319c4bc..e3bd3ed 100644
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/ASMBirthmarkExtractor.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/ASMBirthmarkExtractor.java
@@ -8,7 +8,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import jp.naist.se.stigmata.Birthmark;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.BirthmarkExtractionFailedException;
 import jp.naist.se.stigmata.spi.BirthmarkSpi;
 
@@ -32,11 +32,11 @@ public abstract class ASMBirthmarkExtractor extends AbstractBirthmarkExtractor{
     }
 
     public abstract BirthmarkExtractVisitor
-        createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkContext context);
+        createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment context);
 
     @Override
     public Birthmark extract(Birthmark birthmark, InputStream in,
-                             BirthmarkContext context) throws BirthmarkExtractionFailedException{
+                             BirthmarkEnvironment context) throws BirthmarkExtractionFailedException{
         BirthmarkExtractionFailedException bee = new BirthmarkExtractionFailedException();
 
         try{
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/AbstractBirthmarkExtractor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/AbstractBirthmarkExtractor.java
index 3d06e13..276cd27 100644
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/AbstractBirthmarkExtractor.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/AbstractBirthmarkExtractor.java
@@ -8,7 +8,7 @@ import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 
 import jp.naist.se.stigmata.Birthmark;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.BirthmarkExtractionFailedException;
 import jp.naist.se.stigmata.BirthmarkExtractor;
 import jp.naist.se.stigmata.ExtractionUnit;
@@ -51,55 +51,55 @@ public abstract class AbstractBirthmarkExtractor implements BirthmarkExtractor{
      * extract birthmark given stream.
      */
     public final Birthmark extract(InputStream in) throws BirthmarkExtractionFailedException{
-        return extract(in, BirthmarkContext.getDefaultContext());
+        return extract(in, BirthmarkEnvironment.getDefaultContext());
     }
 
     /**
      * extract birthmark given byte array.
      */
     public final Birthmark extract(byte[] bytecode) throws BirthmarkExtractionFailedException{
-        return extract(bytecode, BirthmarkContext.getDefaultContext());
+        return extract(bytecode, BirthmarkEnvironment.getDefaultContext());
     }
 
     /**
      * extract birthmark given stream.
      */
     public final Birthmark extract(Birthmark birthmark, InputStream in) throws BirthmarkExtractionFailedException{
-        return extract(birthmark, in, BirthmarkContext.getDefaultContext());
+        return extract(birthmark, in, BirthmarkEnvironment.getDefaultContext());
     }
 
     /**
      * extract birthmark given byte array.
      */
     public final Birthmark extract(Birthmark birthmark, byte[] bytecode) throws BirthmarkExtractionFailedException{
-        return extract(birthmark, bytecode, BirthmarkContext.getDefaultContext());
+        return extract(birthmark, bytecode, BirthmarkEnvironment.getDefaultContext());
     }
 
     /**
      * extract birthmark given stream with given context.
      */
-    public final Birthmark extract(InputStream in, BirthmarkContext context) throws BirthmarkExtractionFailedException{
+    public final Birthmark extract(InputStream in, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException{
         return extract(createBirthmark(), in, context);
     }
 
     /**
      * extract birthmark given byte array with given context.
      */
-    public final Birthmark extract(Birthmark birthmark, byte[] bytecode, BirthmarkContext context) throws BirthmarkExtractionFailedException{
+    public final Birthmark extract(Birthmark birthmark, byte[] bytecode, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException{
         return extract(birthmark, new ByteArrayInputStream(bytecode), context);
     }
 
     /**
      * extract birthmark given byte array with given context.
      */
-    public final Birthmark extract(byte[] bytecode, BirthmarkContext context) throws BirthmarkExtractionFailedException{
+    public final Birthmark extract(byte[] bytecode, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException{
         return extract(createBirthmark(), new ByteArrayInputStream(bytecode), context);
     }
 
     /**
      * extract birthmark given stream with given context.
      */
-    public abstract Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkContext context) throws BirthmarkExtractionFailedException;
+    public abstract Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException;
 
     /**
      * create birthmark.
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/BirthmarkExtractVisitor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/BirthmarkExtractVisitor.java
index 182cbbe..80bdddd 100644
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/BirthmarkExtractVisitor.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/BirthmarkExtractVisitor.java
@@ -8,7 +8,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import jp.naist.se.stigmata.Birthmark;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.BirthmarkElement;
 
 import org.objectweb.asm.ClassAdapter;
@@ -22,16 +22,16 @@ import org.objectweb.asm.ClassVisitor;
  */
 public abstract class BirthmarkExtractVisitor extends ClassAdapter{
     private Birthmark birthmark;
-    private BirthmarkContext context;
+    private BirthmarkEnvironment context;
     private List<Throwable> causes = new ArrayList<Throwable>();
 
-    public BirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkContext context){
+    public BirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkEnvironment context){
         super(visitor);
         this.birthmark = birthmark;
         this.context = context;
     }
 
-    protected BirthmarkContext getContext(){
+    protected BirthmarkEnvironment getContext(){
         return context;
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/BirthmarkService.java b/src/main/java/jp/naist/se/stigmata/birthmarks/BirthmarkService.java
index bf5adda..a3958ed 100644
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/BirthmarkService.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/BirthmarkService.java
@@ -7,7 +7,7 @@ package jp.naist.se.stigmata.birthmarks;
 import java.lang.reflect.Constructor;
 
 import jp.naist.se.stigmata.BirthmarkComparator;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.BirthmarkExtractor;
 import jp.naist.se.stigmata.spi.BirthmarkSpi;
 
@@ -27,16 +27,16 @@ public class BirthmarkService extends AbstractBirthmarkService implements Birthm
     private BirthmarkExtractor extractorObject;
     private BirthmarkComparator comparatorObject;
     private boolean userDefined = true;
-    private BirthmarkContext context;
+    private BirthmarkEnvironment context;
 
-    public BirthmarkService(BirthmarkContext context){
+    public BirthmarkService(BirthmarkEnvironment context){
         this.context = context;
     }
 
     public BirthmarkService(){
     }
 
-    public void setBirthmarkContext(BirthmarkContext context){
+    public void setBirthmarkContext(BirthmarkEnvironment context){
         this.context = context;
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractVisitor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractVisitor.java
index 4b40d65..30883a6 100644
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractVisitor.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractVisitor.java
@@ -8,7 +8,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import jp.naist.se.stigmata.Birthmark;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.birthmarks.BirthmarkExtractVisitor;
 
 import org.objectweb.asm.ClassVisitor;
@@ -29,7 +29,7 @@ public class ConstantValueOfFieldVariableBirthmarkExtractVisitor extends Birthma
     private Map<String, TypeAndValueBirthmarkElement> elements = new LinkedHashMap<String, TypeAndValueBirthmarkElement>();
     private String className;
 
-    public ConstantValueOfFieldVariableBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkContext context){
+    public ConstantValueOfFieldVariableBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkEnvironment context){
         super(visitor, birthmark, context);
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractor.java
index 9f7ff75..0328f5e 100644
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractor.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractor.java
@@ -5,7 +5,7 @@ package jp.naist.se.stigmata.birthmarks.cvfv;
  */
 
 import jp.naist.se.stigmata.Birthmark;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.ExtractionUnit;
 import jp.naist.se.stigmata.birthmarks.ASMBirthmarkExtractor;
 import jp.naist.se.stigmata.birthmarks.BirthmarkExtractVisitor;
@@ -28,7 +28,7 @@ public class ConstantValueOfFieldVariableBirthmarkExtractor extends ASMBirthmark
     }
 
     @Override
-    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkContext context) {
+    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment context) {
         return new ConstantValueOfFieldVariableBirthmarkExtractVisitor(writer, birthmark, context);
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/fmc/FrequencyMethodCallBirthmarkExtractor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/fmc/FrequencyMethodCallBirthmarkExtractor.java
index db377ad..f0ece27 100755
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/fmc/FrequencyMethodCallBirthmarkExtractor.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/fmc/FrequencyMethodCallBirthmarkExtractor.java
@@ -5,7 +5,7 @@ package jp.naist.se.stigmata.birthmarks.fmc;
  */
 
 import jp.naist.se.stigmata.Birthmark;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.ExtractionUnit;
 import jp.naist.se.stigmata.birthmarks.ASMBirthmarkExtractor;
 import jp.naist.se.stigmata.birthmarks.BirthmarkExtractVisitor;
@@ -30,7 +30,7 @@ public class FrequencyMethodCallBirthmarkExtractor extends ASMBirthmarkExtractor
     }
 
     @Override
-    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkContext context){
+    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment context){
         return new SequentialMethodCallBirthmarkExtractVisitor(writer, birthmark, context){
             @Override
             protected void addElement(String className, String methodName, String description){
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/fuc/FrequencyUsedClassesBirthmarkExtractor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/fuc/FrequencyUsedClassesBirthmarkExtractor.java
index 143fdc7..0b58158 100755
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/fuc/FrequencyUsedClassesBirthmarkExtractor.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/fuc/FrequencyUsedClassesBirthmarkExtractor.java
@@ -5,7 +5,7 @@ package jp.naist.se.stigmata.birthmarks.fuc;
  */
 
 import jp.naist.se.stigmata.Birthmark;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.ExtractionUnit;
 import jp.naist.se.stigmata.birthmarks.ASMBirthmarkExtractor;
 import jp.naist.se.stigmata.birthmarks.BirthmarkExtractVisitor;
@@ -30,7 +30,7 @@ public class FrequencyUsedClassesBirthmarkExtractor extends ASMBirthmarkExtracto
     }
 
     @Override
-    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkContext context){
+    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment context){
         return new UsedClassesBirthmarkExtractVisitor(writer, birthmark, context);
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractVisitor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractVisitor.java
index a801877..7cd774a 100644
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractVisitor.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractVisitor.java
@@ -5,7 +5,7 @@ package jp.naist.se.stigmata.birthmarks.is;
  */
 
 import jp.naist.se.stigmata.Birthmark;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.BirthmarkElement;
 import jp.naist.se.stigmata.birthmarks.BirthmarkExtractVisitor;
 import jp.naist.se.stigmata.birthmarks.NullBirthmarkElement;
@@ -21,7 +21,7 @@ import org.objectweb.asm.ClassVisitor;
  * @version $Revision$ $Date$
  */
 public class InheritanceStructureBirthmarkExtractVisitor extends BirthmarkExtractVisitor{
-    public InheritanceStructureBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkContext context){
+    public InheritanceStructureBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkEnvironment context){
         super(visitor, birthmark, context);
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractor.java
index 6d8ddd8..c79d691 100644
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractor.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/is/InheritanceStructureBirthmarkExtractor.java
@@ -8,7 +8,7 @@ import java.io.IOException;
 import java.io.InputStream;
 
 import jp.naist.se.stigmata.Birthmark;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.BirthmarkElementClassNotFoundException;
 import jp.naist.se.stigmata.BirthmarkExtractionFailedException;
 import jp.naist.se.stigmata.ExtractionUnit;
@@ -36,7 +36,7 @@ public class InheritanceStructureBirthmarkExtractor extends AbstractBirthmarkExt
     }
 
     @Override
-    public Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkContext context) throws BirthmarkExtractionFailedException{
+    public Birthmark extract(Birthmark birthmark, InputStream in, BirthmarkEnvironment context) throws BirthmarkExtractionFailedException{
         BirthmarkElementClassNotFoundException e = new BirthmarkElementClassNotFoundException();
 
         try{
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractVisitor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractVisitor.java
index ce48906..7ce5524 100644
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractVisitor.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractVisitor.java
@@ -10,7 +10,7 @@ import java.util.List;
 import java.util.Set;
 
 import jp.naist.se.stigmata.Birthmark;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.birthmarks.BirthmarkExtractVisitor;
 
 import org.objectweb.asm.ClassVisitor;
@@ -25,7 +25,7 @@ public class KGramBasedBirthmarkExtractVisitor extends BirthmarkExtractVisitor{
     private int kvalue;
     private List<Integer> opcodes = new ArrayList<Integer>();
 
-    public KGramBasedBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkContext context){
+    public KGramBasedBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkEnvironment context){
         super(visitor, birthmark, context);
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractor.java
index 5b759fc..0415296 100644
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractor.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/kgram/KGramBasedBirthmarkExtractor.java
@@ -5,7 +5,7 @@ package jp.naist.se.stigmata.birthmarks.kgram;
  */
 
 import jp.naist.se.stigmata.Birthmark;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.ExtractionUnit;
 import jp.naist.se.stigmata.birthmarks.ASMBirthmarkExtractor;
 import jp.naist.se.stigmata.birthmarks.BirthmarkExtractVisitor;
@@ -37,7 +37,7 @@ public class KGramBasedBirthmarkExtractor extends ASMBirthmarkExtractor{
     }
 
     @Override
-    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkContext context){
+    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment context){
         KGramBasedBirthmarkExtractVisitor extractor = new KGramBasedBirthmarkExtractVisitor(writer, birthmark, context);
         extractor.setKValue(getKValue());
         return extractor;
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractVisitor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractVisitor.java
index 7a44d20..e6874da 100644
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractVisitor.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractVisitor.java
@@ -5,7 +5,7 @@ package jp.naist.se.stigmata.birthmarks.smc;
  */
 
 import jp.naist.se.stigmata.Birthmark;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.birthmarks.BirthmarkExtractVisitor;
 
 import org.objectweb.asm.ClassVisitor;
@@ -20,7 +20,7 @@ import org.objectweb.asm.MethodVisitor;
  * @version $Revision$ $Date$
  */
 public class SequentialMethodCallBirthmarkExtractVisitor extends BirthmarkExtractVisitor{
-    public SequentialMethodCallBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkContext context){
+    public SequentialMethodCallBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkEnvironment context){
         super(visitor, birthmark, context);
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractor.java
index 372319d..df196ab 100644
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractor.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractor.java
@@ -5,7 +5,7 @@ package jp.naist.se.stigmata.birthmarks.smc;
  */
 
 import jp.naist.se.stigmata.Birthmark;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.ExtractionUnit;
 import jp.naist.se.stigmata.birthmarks.ASMBirthmarkExtractor;
 import jp.naist.se.stigmata.birthmarks.BirthmarkExtractVisitor;
@@ -27,7 +27,7 @@ public class SequentialMethodCallBirthmarkExtractor extends ASMBirthmarkExtracto
     }
 
     @Override
-    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkContext context){
+    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment context){
         return new SequentialMethodCallBirthmarkExtractVisitor(writer, birthmark, context);
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractVisitor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractVisitor.java
index 01a67d6..80ccd40 100644
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractVisitor.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractVisitor.java
@@ -5,7 +5,7 @@ package jp.naist.se.stigmata.birthmarks.uc;
  */
 
 import jp.naist.se.stigmata.Birthmark;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.BirthmarkElement;
 import jp.naist.se.stigmata.birthmarks.BirthmarkExtractVisitor;
 
@@ -25,7 +25,7 @@ import org.objectweb.asm.signature.SignatureWriter;
  */
 public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{
     public UsedClassesBirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark,
-                                              BirthmarkContext context){
+                                              BirthmarkEnvironment context){
         super(visitor, birthmark, context);
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractor.java b/src/main/java/jp/naist/se/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractor.java
index a157292..4c8cb2e 100644
--- a/src/main/java/jp/naist/se/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractor.java
+++ b/src/main/java/jp/naist/se/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractor.java
@@ -5,7 +5,7 @@ package jp.naist.se.stigmata.birthmarks.uc;
  */
 
 import jp.naist.se.stigmata.Birthmark;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.ExtractionUnit;
 import jp.naist.se.stigmata.birthmarks.ASMBirthmarkExtractor;
 import jp.naist.se.stigmata.birthmarks.BirthmarkExtractVisitor;
@@ -28,7 +28,7 @@ public class UsedClassesBirthmarkExtractor extends ASMBirthmarkExtractor{
     }
 
     @Override
-    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkContext context){
+    public BirthmarkExtractVisitor createExtractVisitor(ClassWriter writer, Birthmark birthmark, BirthmarkEnvironment context){
         return new UsedClassesBirthmarkExtractVisitor(writer, birthmark, context);
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/filter/FilteredComparisonResultSet.java b/src/main/java/jp/naist/se/stigmata/filter/FilteredComparisonResultSet.java
index abd3c98..4a04802 100644
--- a/src/main/java/jp/naist/se/stigmata/filter/FilteredComparisonResultSet.java
+++ b/src/main/java/jp/naist/se/stigmata/filter/FilteredComparisonResultSet.java
@@ -8,7 +8,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.BirthmarkSet;
 import jp.naist.se.stigmata.ComparisonPair;
 import jp.naist.se.stigmata.ComparisonPairFilterSet;
@@ -57,7 +57,7 @@ public class FilteredComparisonResultSet implements ComparisonResultSet{
         return resultset.getComparisonCount();
     }
 
-    public BirthmarkContext getContext(){
+    public BirthmarkEnvironment getContext(){
         return resultset.getContext();
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkDefinitionPane.java b/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkDefinitionPane.java
index 162b106..3197511 100644
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkDefinitionPane.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkDefinitionPane.java
@@ -34,7 +34,7 @@ import javax.swing.event.DocumentListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.birthmarks.BirthmarkService;
 import jp.naist.se.stigmata.spi.BirthmarkComparatorSpi;
 import jp.naist.se.stigmata.spi.BirthmarkExtractorSpi;
@@ -80,7 +80,7 @@ public class BirthmarkDefinitionPane extends JPanel{
         }
     }
 
-    public void updateContext(BirthmarkContext context){
+    public void updateContext(BirthmarkEnvironment context){
         for(BirthmarkSpi service: addedService){
             if(context.getService(service.getType()) == null){
                 if(service instanceof BirthmarkService){
@@ -282,7 +282,7 @@ public class BirthmarkDefinitionPane extends JPanel{
             if(selectedComparator != null){
                 comparatorClass = selectedComparator.toString();
             }
-            BirthmarkContext context = stigmata.getContext();
+            BirthmarkEnvironment context = stigmata.getContext();
 
             boolean flag = newType.length() > 0
                     && displayType.getText().length() > 0
diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkExtractionResultPane.java b/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkExtractionResultPane.java
index d90cfdb..c513201 100644
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkExtractionResultPane.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/BirthmarkExtractionResultPane.java
@@ -15,7 +15,7 @@ import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
 
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.BirthmarkSet;
 import jp.naist.se.stigmata.format.BirthmarkExtractionResultFormat;
 import jp.naist.se.stigmata.format.FormatManager;
@@ -32,7 +32,7 @@ public class BirthmarkExtractionResultPane extends JPanel{
     private List<BirthmarkSet> birthmarks;
     private StigmataFrame frame;
 
-    public BirthmarkExtractionResultPane(StigmataFrame stigmataFrame, BirthmarkContext context, BirthmarkSet[] sets){
+    public BirthmarkExtractionResultPane(StigmataFrame stigmataFrame, BirthmarkEnvironment context, BirthmarkSet[] sets){
         this.frame = stigmataFrame;
         this.birthmarks = Arrays.asList(sets);
 
diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/CompareTableCellRenderer.java b/src/main/java/jp/naist/se/stigmata/ui/swing/CompareTableCellRenderer.java
index 4615385..5e4d62b 100644
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/CompareTableCellRenderer.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/CompareTableCellRenderer.java
@@ -10,7 +10,7 @@ import java.awt.Component;
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableCellRenderer;
 
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 
 /**
  *
@@ -21,9 +21,9 @@ public class CompareTableCellRenderer extends DefaultTableCellRenderer{
     private static final long serialVersionUID = 234557758658567345L;
     private static final double EPSILON = 1E-8d;
 
-    private BirthmarkContext context;
+    private BirthmarkEnvironment context;
 
-    public CompareTableCellRenderer(BirthmarkContext context){
+    public CompareTableCellRenderer(BirthmarkEnvironment context){
         this.context = context;
     }
 
@@ -69,7 +69,7 @@ public class CompareTableCellRenderer extends DefaultTableCellRenderer{
         return c;
     }
 
-    public static Color getBackgroundColor(int rank, BirthmarkContext context){
+    public static Color getBackgroundColor(int rank, BirthmarkEnvironment context){
         Color c = getColor("backcolor_" + rank, context);
         if(c == null){
             return getDefaultBackgroundColor(rank);
@@ -77,7 +77,7 @@ public class CompareTableCellRenderer extends DefaultTableCellRenderer{
         return c;
     }
 
-    public static Color getForegroundColor(int rank, BirthmarkContext context){
+    public static Color getForegroundColor(int rank, BirthmarkEnvironment context){
         Color c = getColor("forecolor_" + rank, context);
         if(c == null){
             c = getDefaultForegroundColor(rank);
@@ -85,7 +85,7 @@ public class CompareTableCellRenderer extends DefaultTableCellRenderer{
         return c;
     }
 
-    private static Color getColor(String key, BirthmarkContext context){
+    private static Color getColor(String key, BirthmarkEnvironment context){
         String v = context.getProperty(key);
         try{
             int color = Integer.parseInt(v, 16);
diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java b/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java
index fbba814..ade9c1f 100644
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/ControlPane.java
@@ -27,7 +27,7 @@ import javax.swing.JPanel;
 import javax.swing.JTabbedPane;
 import javax.swing.border.TitledBorder;
 
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.ExtractionUnit;
 import jp.naist.se.stigmata.filter.ComparisonPairFilterManager;
 import jp.naist.se.stigmata.reader.ClasspathContext;
@@ -118,7 +118,7 @@ public class ControlPane extends JPanel{
         );
 
         if(file != null){
-            BirthmarkContext context = generateContext();
+            BirthmarkEnvironment context = generateContext();
             if(!file.getName().endsWith(".xml")){
                 file = new File(file.getParent(), file.getName() + ".xml");
             }
@@ -223,7 +223,7 @@ public class ControlPane extends JPanel{
     }
 
     private void extractButtonActionPerformed(ActionEvent e){
-        BirthmarkContext context = generateContext();
+        BirthmarkEnvironment context = generateContext();
         String[] fileX = targetX.getValues();
         String[] fileY = targetY.getValues();
         Set<String> targets = new HashSet<String>();
@@ -245,7 +245,7 @@ public class ControlPane extends JPanel{
     }
 
     private void compareRoundRobinWithFiltering(){
-        BirthmarkContext context = generateContext();
+        BirthmarkEnvironment context = generateContext();
         FilterSelectionPane pane = new FilterSelectionPane(
             context.getFilterManager()
         );
@@ -265,7 +265,7 @@ public class ControlPane extends JPanel{
     }
 
     private void compareRoundRobin(){
-        BirthmarkContext context = generateContext();
+        BirthmarkEnvironment context = generateContext();
 
         stigmata.compareRoundRobin(
             birthmarks.getSelectedServiceTypes(), targetX.getValues(), 
@@ -274,7 +274,7 @@ public class ControlPane extends JPanel{
     }
 
     private void compareSpecifiedPair(){
-        BirthmarkContext context = generateContext();
+        BirthmarkEnvironment context = generateContext();
         String[] fileX = targetX.getValues();
         String[] fileY = targetY.getValues();
         stigmata.compareSpecifiedPair(birthmarks.getSelectedServiceTypes(), fileX,
@@ -282,7 +282,7 @@ public class ControlPane extends JPanel{
     }
 
     private void compareGuessedPair(){
-        BirthmarkContext context = generateContext();
+        BirthmarkEnvironment context = generateContext();
         String[] fileX = targetX.getValues();
         String[] fileY = targetY.getValues();
 
@@ -290,8 +290,8 @@ public class ControlPane extends JPanel{
                 fileY, context);
     }
 
-    private BirthmarkContext generateContext(){
-        BirthmarkContext context = stigmata.getStigmata().createContext();
+    private BirthmarkEnvironment generateContext(){
+        BirthmarkEnvironment context = stigmata.getStigmata().createContext();
         ClasspathContext bytecode = context.getClasspathContext();
         WellknownClassManager manager = context.getWellknownClassManager();
         ComparisonPairFilterManager filterManager = context.getFilterManager();
diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/PairComparisonResultSetPane.java b/src/main/java/jp/naist/se/stigmata/ui/swing/PairComparisonResultSetPane.java
index 809a5e3..71532be 100644
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/PairComparisonResultSetPane.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/PairComparisonResultSetPane.java
@@ -27,7 +27,7 @@ import javax.swing.JTable;
 import javax.swing.border.TitledBorder;
 import javax.swing.table.DefaultTableModel;
 
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.BirthmarkSet;
 import jp.naist.se.stigmata.CertainPairComparisonResultSet;
 import jp.naist.se.stigmata.ComparisonPair;
@@ -47,7 +47,7 @@ public class PairComparisonResultSetPane extends JPanel{
     private static final long serialVersionUID = 3298346465652354302L;
 
     private StigmataFrame frame;
-    private BirthmarkContext context;
+    private BirthmarkEnvironment context;
     private DefaultTableModel model = new PairComparisonResultSetTableModel();
     private JTable table = new JTable(model);
     private JLabel averageLabel, maximumLabel, minimumLabel;
diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/PropertyEditPane.java b/src/main/java/jp/naist/se/stigmata/ui/swing/PropertyEditPane.java
index 2242b92..d768ee5 100644
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/PropertyEditPane.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/PropertyEditPane.java
@@ -27,7 +27,7 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableModel;
 
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 
 /**
  * 
@@ -48,7 +48,7 @@ public class PropertyEditPane extends JPanel{
         initData();
     }
 
-    public void updateContext(BirthmarkContext context){
+    public void updateContext(BirthmarkEnvironment context){
         context.clearProperties();
         for(int i = 0; i < model.getRowCount(); i++){
             context.addProperty(
@@ -59,7 +59,7 @@ public class PropertyEditPane extends JPanel{
     }
 
     private void initData(){
-        BirthmarkContext context = stigmata.getContext();
+        BirthmarkEnvironment context = stigmata.getContext();
         context.addPropertyListener(new PropertyChangeListener(){
             public void propertyChange(PropertyChangeEvent evt){
                 String name = evt.getPropertyName();
diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/RoundRobinComparisonResultPane.java b/src/main/java/jp/naist/se/stigmata/ui/swing/RoundRobinComparisonResultPane.java
index 54b1146..a760751 100644
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/RoundRobinComparisonResultPane.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/RoundRobinComparisonResultPane.java
@@ -34,7 +34,7 @@ import javax.swing.table.DefaultTableModel;
 
 import jp.naist.se.stigmata.Birthmark;
 import jp.naist.se.stigmata.BirthmarkComparator;
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.BirthmarkSet;
 import jp.naist.se.stigmata.CertainPairComparisonResultSet;
 import jp.naist.se.stigmata.ComparisonResultSet;
@@ -60,9 +60,9 @@ public class RoundRobinComparisonResultPane extends JPanel{
     private JLabel classCount, comparisonCount, distinctionRatio;
     private JLabel average, minimum, maximum;
     private StigmataFrame stigmataFrame;
-    private BirthmarkContext context;
+    private BirthmarkEnvironment context;
 
-    public RoundRobinComparisonResultPane(StigmataFrame stigmata, BirthmarkContext context,
+    public RoundRobinComparisonResultPane(StigmataFrame stigmata, BirthmarkEnvironment context,
                                           BirthmarkSet[] birthmarksX, BirthmarkSet[] birthmarksY){
         this.stigmataFrame = stigmata;
         this.context = context;
@@ -112,7 +112,7 @@ public class RoundRobinComparisonResultPane extends JPanel{
         maximum.setText(Double.toString(max));
     }
 
-    private double compare(BirthmarkContext context, BirthmarkSet x, BirthmarkSet y){
+    private double compare(BirthmarkEnvironment context, BirthmarkSet x, BirthmarkSet y){
         double similarity = 0d;
         int count = 0;
 
diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java b/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java
index a493aaa..ae19265 100644
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/StigmataFrame.java
@@ -38,7 +38,7 @@ import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.filechooser.FileFilter;
 
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.BirthmarkElementClassNotFoundException;
 import jp.naist.se.stigmata.BirthmarkExtractionFailedException;
 import jp.naist.se.stigmata.BirthmarkSet;
@@ -70,7 +70,7 @@ public class StigmataFrame extends JFrame{
     private JMenuItem closeTabMenu;
     private JCheckBoxMenuItem expertmodeMenu;
     private Stigmata stigmata;
-    private BirthmarkContext context;
+    private BirthmarkEnvironment context;
     private ControlPane control;
     private FileIOManager fileio;
     private Map<String, Integer> countmap = new HashMap<String, Integer>();
@@ -83,7 +83,7 @@ public class StigmataFrame extends JFrame{
         this(stigmata, stigmata.createContext());
     }
 
-    public StigmataFrame(Stigmata stigmata, BirthmarkContext context){
+    public StigmataFrame(Stigmata stigmata, BirthmarkEnvironment context){
         this.stigmata = stigmata;
         this.context = context;
         this.fileio = new FileIOManager(this);
@@ -102,7 +102,7 @@ public class StigmataFrame extends JFrame{
         return stigmata;
     }
 
-    public BirthmarkContext getContext(){
+    public BirthmarkEnvironment getContext(){
         return context;
     }
 
@@ -152,7 +152,7 @@ public class StigmataFrame extends JFrame{
         control.removeBirthmarkServiceListener(listener);
     }
 
-    public void compareDetails(BirthmarkSet target1, BirthmarkSet target2, BirthmarkContext context){
+    public void compareDetails(BirthmarkSet target1, BirthmarkSet target2, BirthmarkEnvironment context){
         PairComparisonPane detail = new PairComparisonPane(
             this, new ComparisonPair(target1, target2, context)
         );
@@ -170,7 +170,7 @@ public class StigmataFrame extends JFrame{
     }
 
     public void compareRoundRobin(String[] birthmarks, String[] targetX, String[] targetY, 
-                                   BirthmarkContext context){
+                                   BirthmarkEnvironment context){
         try{
             BirthmarkSet[] x = stigmata.extract(birthmarks, targetX, context);
             BirthmarkSet[] y = stigmata.extract(birthmarks, targetY, context);
@@ -193,7 +193,7 @@ public class StigmataFrame extends JFrame{
     }
 
     public void compareRoundRobin(String[] birthmarks, String[] targetX, String[] targetY, 
-                                   String[] filterNames, BirthmarkContext context){
+                                   String[] filterNames, BirthmarkEnvironment context){
         try{
             BirthmarkSet[] x = stigmata.extract(birthmarks, targetX, context);
             BirthmarkSet[] y = stigmata.extract(birthmarks, targetY, context);
@@ -218,7 +218,7 @@ public class StigmataFrame extends JFrame{
     }
 
     public void compareGuessedPair(String[] birthmarks, String[] targetX, String[] targetY,
-                                   BirthmarkContext context){
+                                   BirthmarkEnvironment context){
         try{
             BirthmarkSet[] x = stigmata.extract(birthmarks, targetX, context);
             BirthmarkSet[] y = stigmata.extract(birthmarks, targetY, context);
@@ -241,7 +241,7 @@ public class StigmataFrame extends JFrame{
     }
 
     public void compareSpecifiedPair(String[] birthmarks, String[] targetX, String[] targetY,
-                                     BirthmarkContext context){
+                                     BirthmarkEnvironment context){
         File file = getOpenFile(Messages.getStringArray("comparemapping.extension"),
                                 Messages.getString("comparemapping.description"));
 
@@ -300,7 +300,7 @@ public class StigmataFrame extends JFrame{
         tabPane.setSelectedIndex(tabPane.getTabCount() - 1);
     }
 
-    public void showExtractionResult(BirthmarkSet[] set, BirthmarkContext context){
+    public void showExtractionResult(BirthmarkSet[] set, BirthmarkEnvironment context){
         int extractCount = getNextCount("extract");
         BirthmarkExtractionResultPane viewer = new BirthmarkExtractionResultPane(this, context, set);
         Utility.addNewTab(
@@ -312,7 +312,7 @@ public class StigmataFrame extends JFrame{
         
     }
 
-    public void extract(String[] birthmarks, String[] targets, BirthmarkContext context){
+    public void extract(String[] birthmarks, String[] targets, BirthmarkEnvironment context){
         try{
             BirthmarkSet[] holders = stigmata.extract(birthmarks, targets, context);
             showExtractionResult(holders, context);
diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/actions/UpdateBirthmarkCellColorAction.java b/src/main/java/jp/naist/se/stigmata/ui/swing/actions/UpdateBirthmarkCellColorAction.java
index 3cd1d9c..f77c8c9 100755
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/actions/UpdateBirthmarkCellColorAction.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/actions/UpdateBirthmarkCellColorAction.java
@@ -15,7 +15,7 @@ import javax.swing.JLabel;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.ui.swing.CompareTableCellRenderer;
 import jp.naist.se.stigmata.ui.swing.Messages;
 import jp.naist.se.stigmata.ui.swing.Utility;
@@ -24,16 +24,16 @@ public class UpdateBirthmarkCellColorAction extends AbstractAction{
     private static final long serialVersionUID = 2390797591047570440L;
 
     private Component parent;
-    private BirthmarkContext context;
+    private BirthmarkEnvironment context;
     private JColorChooser chooser;
 
-    public UpdateBirthmarkCellColorAction(Component parent, BirthmarkContext context){
+    public UpdateBirthmarkCellColorAction(Component parent, BirthmarkEnvironment context){
         this.parent = parent;
         this.context = context;
     }
 
     public UpdateBirthmarkCellColorAction(Component parent){
-        this(parent, BirthmarkContext.getDefaultContext());
+        this(parent, BirthmarkEnvironment.getDefaultContext());
     }
 
     public void actionPerformed(ActionEvent e){
diff --git a/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphPanel.java b/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphPanel.java
index bd721e9..7ba6db6 100644
--- a/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphPanel.java
+++ b/src/main/java/jp/naist/se/stigmata/ui/swing/mds/MDSGraphPanel.java
@@ -22,7 +22,7 @@ import javax.swing.JComboBox;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.BirthmarkSet;
 import jp.naist.se.stigmata.ComparisonPair;
 import jp.naist.se.stigmata.ui.swing.ClippedLRListCellRenderer;
@@ -52,7 +52,7 @@ public class MDSGraphPanel extends JPanel{
         this(stigmata, set, stigmata.getContext());
     }
 
-    public MDSGraphPanel(StigmataFrame stigmata, BirthmarkSet[] set, BirthmarkContext context){
+    public MDSGraphPanel(StigmataFrame stigmata, BirthmarkSet[] set, BirthmarkEnvironment context){
         this.stigmata = stigmata;
         this.set = set;
 
@@ -60,7 +60,7 @@ public class MDSGraphPanel extends JPanel{
         initLayouts(matrix);
     }
 
-    private double[][] initData(BirthmarkSet[] set, BirthmarkContext context){
+    private double[][] initData(BirthmarkSet[] set, BirthmarkEnvironment context){
         labels = new LabelMap();
         double[][] matrix = new double[set.length][set.length];
 
@@ -90,7 +90,7 @@ public class MDSGraphPanel extends JPanel{
 
     /**
      * This method must called after
-     * {@link #initData(BirthmarkSet[], BirthmarkContext) <code>initData</code>}.
+     * {@link #initData(BirthmarkSet[], BirthmarkEnvironment) <code>initData</code>}.
      * Because this method uses calculated value in initData method.
      */
     private void initLayouts(double[][] matrix){
diff --git a/src/main/java/jp/naist/se/stigmata/utils/ConfigFileExporter.java b/src/main/java/jp/naist/se/stigmata/utils/ConfigFileExporter.java
index d2e2381..bc532ae 100644
--- a/src/main/java/jp/naist/se/stigmata/utils/ConfigFileExporter.java
+++ b/src/main/java/jp/naist/se/stigmata/utils/ConfigFileExporter.java
@@ -9,7 +9,7 @@ import java.net.URL;
 import java.util.Iterator;
 import java.util.Map;
 
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.ComparisonPairFilter;
 import jp.naist.se.stigmata.ComparisonPairFilterSet;
 import jp.naist.se.stigmata.birthmarks.BirthmarkService;
@@ -24,13 +24,13 @@ import org.apache.commons.beanutils.BeanUtils;
  * @version $Revision$ $Date$
  */
 public class ConfigFileExporter{
-    private BirthmarkContext context;
+    private BirthmarkEnvironment context;
 
-    public ConfigFileExporter(BirthmarkContext context){
+    public ConfigFileExporter(BirthmarkEnvironment context){
         this.context = context;
     }
 
-    public void export(BirthmarkContext context, PrintWriter out) throws IOException{
+    public void export(BirthmarkEnvironment context, PrintWriter out) throws IOException{
         new ConfigFileExporter(context).export(out);
     }
 
diff --git a/src/main/java/jp/naist/se/stigmata/utils/ConfigFileImporter.java b/src/main/java/jp/naist/se/stigmata/utils/ConfigFileImporter.java
index 7fda4b0..912f6a7 100644
--- a/src/main/java/jp/naist/se/stigmata/utils/ConfigFileImporter.java
+++ b/src/main/java/jp/naist/se/stigmata/utils/ConfigFileImporter.java
@@ -15,7 +15,7 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 
-import jp.naist.se.stigmata.BirthmarkContext;
+import jp.naist.se.stigmata.BirthmarkEnvironment;
 import jp.naist.se.stigmata.ComparisonPairFilter;
 import jp.naist.se.stigmata.ComparisonPairFilterSet;
 import jp.naist.se.stigmata.birthmarks.BirthmarkService;
@@ -31,9 +31,9 @@ import org.xml.sax.helpers.DefaultHandler;
  * @version $Revision$ $Date$
  */
 public class ConfigFileImporter{
-    private BirthmarkContext context;
+    private BirthmarkEnvironment context;
 
-    public ConfigFileImporter(BirthmarkContext context){
+    public ConfigFileImporter(BirthmarkEnvironment context){
         this.context = context;
     }
 
@@ -41,7 +41,7 @@ public class ConfigFileImporter{
         // generate context.
     }
 
-    public BirthmarkContext parse(InputStream in) throws IOException{
+    public BirthmarkEnvironment parse(InputStream in) throws IOException{
         try{
             SAXParserFactory factory = SAXParserFactory.newInstance();
             SAXParser parser = factory.newSAXParser();
@@ -57,11 +57,11 @@ public class ConfigFileImporter{
         }
     }
 
-    public BirthmarkContext getContext(){
+    public BirthmarkEnvironment getContext(){
         return context;
     }
 
-    public void setContext(BirthmarkContext context){
+    public void setContext(BirthmarkEnvironment context){
         this.context = context;
     }
 
@@ -70,7 +70,7 @@ public class ConfigFileImporter{
     }
 
     private static class Handler extends DefaultHandler{
-        private BirthmarkContext context;
+        private BirthmarkEnvironment context;
         private WellknownClassManager manager;
         private BirthmarkService service;
         private ComparisonPairFilterSet filter;
@@ -82,15 +82,15 @@ public class ConfigFileImporter{
         private String filterType, filterCriterion, attributeName;
         private Map<String, String> filterAttributes = new HashMap<String, String>();
 
-        public Handler(BirthmarkContext context){
+        public Handler(BirthmarkEnvironment context){
             if(context == null){
-                context = new BirthmarkContext();
+                context = new BirthmarkEnvironment();
             }
             this.context = context;
             this.manager = context.getWellknownClassManager();
         }
 
-        public BirthmarkContext getContext(){
+        public BirthmarkEnvironment getContext(){
             return context;
         }
 
diff --git a/src/test/java/jp/naist/se/stigmata/StigmataTest.java b/src/test/java/jp/naist/se/stigmata/StigmataTest.java
index 82447df..e05a3f8 100755
--- a/src/test/java/jp/naist/se/stigmata/StigmataTest.java
+++ b/src/test/java/jp/naist/se/stigmata/StigmataTest.java
@@ -16,7 +16,7 @@ import org.junit.Test;
  * @version $Revision$ $Date$
  */
 public class StigmataTest{
-    private BirthmarkContext context;
+    private BirthmarkEnvironment context;
 
     @Before
     public void prepare(){