Updates for better package and class naming.