Made block names consistent with English patch

Now that I know the maximum length of each name (32), I can be a little more specific.