unified epName parsing (All tests pass again);