Variable name changes, backed out SingletonModel components.