EA-50 Refactor to use localisation hierarchy, which means it's picking up correct names