Toast Bugs fixed - Refactored file names to match guidelines