Added underscore to packagename match regex