Fixes block names