small package naming fixes