some code refactoring, making block names more consistent

2 jobs for master in 20 seconds (queued for 2 seconds)