Bug#4035 - HiddenStores file not renamed every time