adapt to package naming conventions