NNPC is to be broken down into 5 different units namely:

1. National Petroleum Directorate
2. National Oil Company
3. Petroleum Inspectorate Commission
4. Petroleum Products Distribution Authority
5. National Oil and Gas Assets Holding and Management Services

The National Petroleum Directorate would replace the ministry, while the National Oil Company would play the role being played by the NNPC. The Petroleum Inspectorate Commission would replace the current DPR, while the Petroleum Products Distribution Authority would replace the Petroleum Products Pricing Regulatory Agency. National Oil and Gas Assets Holding and Management Services would manage the assets owned by both the ministry and the NNPC.