Improve names of fish_block functions