Improve package naming.