Removed last few bad name lookups.