Merge "[Manual] Fix static variable names"