Fix Public Name issues