Changed sandwich name convention
Changed sandwich name convention
Code cleanup