package naming fixes