rename bucket; add tail return