Fixed public names