refactor, rename blocks