[Task] obey naming convention