Merge "lib/apache: Rename variable"