Renamed controllers and stores (no more multiple filenames)