Refactor from abada to katsu