Added NameConverter and unit tests