lookup: Make lookup type and function names more generic