renaming to support generic block name