Class and Package Name Corrections