refactoring: use cocnsistent name scheme