Fixed some naming inconsistencies. Made log more resilient and added conditions to LogAdapters.