115 rename blocks

Trying again after pushing last changes from local.