Changed keyspace and stores in line with changing how we handle modules