Adding PrefixedNameExpanded plus test cases