new naming scheme for functional tests