Renaming
Updating usage of Store Monad and related facets