rename singleton instances