Revive test on naming convention