Refactor basic block names