Refs #6 - Replaces too oriented lookup name with more generic one.