Namespace change to satisfy maven requirements and bug fixes