Improve blocks and containers default name