Header files general name refactoring;