Renamed and refactor