Fixed numerous global vs local naming conflicts as part of an ongoing refactoring process.