more terminology simplification
plugging more potential false positive holes