Now works with changed Displaynames