Changed names to make them less ambiguous

Changed names to make them less ambiguous, otherwise we can't run those specific tests from the cli without specifying the file they are from.