Merge "Fix mismatch between package and directory names"