more block name changes and trimming