Few variable name updates inside `__buildButtons`