LPS-33959 - Fix all name attributes