Update suite with proper names and proper packages