Rename factory method
fix typehinting