Main Class fix & Temporary Name Fix