Refactor names