Use the correct logger instance
Fix references to moved classes in docs
Rename variables to avoid overwriting built in objects