package naming cleanup