Fix include in gallery test
Rename local variable
Rename local variable
Rename source to
Rename local variable