Removed last few bad name lookups.
Merge branch 'test' into dev