Rename singleton_class{,_of} (fix #940)