Fixed minor issues related to package naming