21cf6dc Better name loading