Renaming and Adding missing classes