Some work on search terms (incomplete)
Semantic naming