BK-379 More name updates from Booki to Booktype