Cosmetics in build system
Polishing renamed objects - fixing header guards, enum values, etc