Made package names more concise