Fix block local variable names