Re-naming some account store modules.