cleanup: refactor naming convention