Replacing proprietary words with more generic terms in source code, debugging crash.

Replacing proprietary words with more generic terms in source code,
debugging crash.
Merge branch 'experimental-local' into experimental