fixing names and header, after move to PX library