Fix block names