apply new naming convention with T