Refactoring in names etc
Fixed headers replacement