It fixes a Name Convention tests and drop an unused code
This will create a new commit in order to revert the existing changes.