Refactor names
Refactor name
Refactor common function to be more abstract