Yes, you can put a USBC into a P2015X by using a P30Z as long as the extra switch is removable.