Change naming, add logging service.