[GDXHTML-6] Small syntax and name refactoring.