refactor Adaptive NameExtractor, simplify Adaptive annotation #55