Fixed package name issue in code and cmake lists