Finish Refactor for PortFactory

Need to change some additional function names.