Modify EB to TB, rename
