Refactor to fully-qualified class references to avoid name collisions

Change-Id: Ie70a4646b3164e01ad728d88f29de29c18e9b2b9