Rename singleton to singular