Minor naming & comments update