refactoring struct name