This patch replaces abbreviations like "blk", "cli", and "srv" by their full forms "block", "client", and "server". Fixes #1258
Norman Feske