adjusted store naming according to new pattern